From 8ab7ef614902fcba10d55b0eb14a0bf12a9b569f Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 11 Jun 2016 20:32:19 +0200 Subject: [PATCH] Merge with develop --- .../src/frontend_service/property_history.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/ryzom/server/src/frontend_service/property_history.h b/code/ryzom/server/src/frontend_service/property_history.h index 8b0a42a17..d42758e40 100644 --- a/code/ryzom/server/src/frontend_service/property_history.h +++ b/code/ryzom/server/src/frontend_service/property_history.h @@ -354,18 +354,18 @@ public: if ( entity.AssociationBitsSent == currentAssociationBits ) { //nlassertex(entity.Used, ("client=%d, entity=%d property=%d", clientId, entityId, property)); - switch ( property ) + if (property == CLFECOMMON::PROPERTY_DISASSOCIATION) + { + // don't do anything + } + else if (property == CLFECOMMON::PROPERTY_POSITION) { - case CLFECOMMON::PROPERTY_DISASSOCIATION: - break; - case CLFECOMMON::PROPERTY_POSITION: entity.Mileage = 0; - break; - default: - { + } + else + { CPropertyEntry &entry = entity.Properties[property]; entry.HasValue = false; - } } return true; }