up

Author: kbengine

KBEngine.cs

@@ -1748,8 +1748,9 @@ public void Client_onEntityLeaveWorld(Int32 eid)
 			}
 			else
 			{
-				_controlledEntities.Remove(entity);
-				Event.fireOut("onLoseControlledEntity", new object[]{entity});
+				if(_controlledEntities.Remove(entity))
+					Event.fireOut("onLoseControlledEntity", new object[]{entity});
+
 				entities.Remove(eid);
 				entity.onDestroy();
 				_entityIDAliasIDList.Remove(eid);
@@ -2074,8 +2075,8 @@ public void Client_onEntityDestroyed(Int32 eid)
 				entity.leaveWorld();
 			}
 
-			_controlledEntities.Remove(entity);
-			Event.fireOut("onLoseControlledEntity", new object[]{entity});
+			if(_controlledEntities.Remove(entity))
+				Event.fireOut("onLoseControlledEntity", new object[]{entity});
 
 			entities.Remove(eid);
 			entity.onDestroy();