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