Merge with develop
This commit is contained in:
parent
8ab7ef6149
commit
8da49a8189
1 changed files with 2 additions and 6 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue