bug fixing

ao-libre · Apr 24, 2019 · 306dd87 · 306dd87
1 parent 51e2694
commit 306dd87
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/client/src/game/managers/WorldManager.java b/client/src/game/managers/WorldManager.java
@@ -22,6 +22,10 @@ public static int getNetworkedEntity(int networkId) {
         return networkedEntities.get(networkId);
     }
 
+    public static boolean hasNetworkedEntity(int networkId) {
+        return networkedEntities.containsKey(networkId);
+    }
+
     public static Set<Integer> getEntities() {
         return new HashSet<>(networkedEntities.values());
     }

diff --git a/client/src/game/network/GameNotificationProcessor.java b/client/src/game/network/GameNotificationProcessor.java
@@ -70,15 +70,19 @@ public void processNotification(InventoryUpdate inventoryUpdate) {
 
     @Override
     public void processNotification(MovementNotification movementNotification) {
-        int playerId = WorldManager.getNetworkedEntity(movementNotification.getPlayerId());
-        E(playerId).aOPhysics();
-        E(playerId).movementAdd(movementNotification.getDestination());
+        if (WorldManager.hasNetworkedEntity(movementNotification.getPlayerId())) {
+            int playerId = WorldManager.getNetworkedEntity(movementNotification.getPlayerId());
+            E(playerId).aOPhysics();
+            E(playerId).movementAdd(movementNotification.getDestination());
+        }
     }
 
     @Override
     public void processNotification(FXNotification fxNotification) {
-        int target = WorldManager.getNetworkedEntity(fxNotification.getTarget());
-        E(target).fXAddFx(fxNotification.getFxGrh());
+        if (WorldManager.hasNetworkedEntity(fxNotification.getTarget())) {
+            int target = WorldManager.getNetworkedEntity(fxNotification.getTarget());
+            E(target).fXAddFx(fxNotification.getFxGrh());
+        }
     }
 
     private void addComponentsToEntity(Entity newEntity, EntityUpdate entityUpdate) {
@@ -90,6 +94,9 @@ private void addComponentsToEntity(Entity newEntity, EntityUpdate entityUpdate)
     }
 
     private void updateEntity(EntityUpdate entityUpdate) {
+        if (WorldManager.hasNetworkedEntity(entityUpdate.entityId)) {
+            return;
+        }
         int entityId = WorldManager.getNetworkedEntity(entityUpdate.entityId);
         Entity entity = WorldManager.getWorld().getEntity(entityId);
         EntityEdit edit = entity.edit();