Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-06-11 20:49:56 +02:00
commit f5aa87c9df
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/ryzom/server/src/frontend_service/property_history.h
View file

@ -354,15 +354,11 @@ public:
if ( entity.AssociationBitsSent == currentAssociationBits ) if ( entity.AssociationBitsSent == currentAssociationBits )
{ {
//nlassertex(entity.Used, ("client=%d, entity=%d property=%d", clientId, entityId, property)); //nlassertex(entity.Used, ("client=%d, entity=%d property=%d", clientId, entityId, property));
if (property == CLFECOMMON::PROPERTY_DISASSOCIATION) if (property == CLFECOMMON::PROPERTY_POSITION)
{
// don't do anything
}
else if (property == CLFECOMMON::PROPERTY_POSITION)
{ {
entity.Mileage = 0; entity.Mileage = 0;
} }
else else if (property != CLFECOMMON::PROPERTY_DISASSOCIATION)
{ {
CPropertyEntry &entry = entity.Properties[property]; CPropertyEntry &entry = entity.Properties[property];
entry.HasValue = false; entry.HasValue = false;