Possible bugfix: users saying ships stay after sink

plaza-in-a-heatwave · Mar 1, 2021 · cecf9c3 · cecf9c3
1 parent 035dff4
commit cecf9c3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/client-core/src/com/benberi/cadesim/client/packet/in/PlayerRespawnPacket.java b/client-core/src/com/benberi/cadesim/client/packet/in/PlayerRespawnPacket.java
@@ -1,5 +1,7 @@
 package com.benberi.cadesim.client.packet.in;
 
+import java.util.HashSet;
+
 import com.benberi.cadesim.GameContext;
 import com.benberi.cadesim.client.codec.util.Packet;
 import com.benberi.cadesim.client.packet.ClientPacketExecutor;
@@ -28,6 +30,8 @@ public void execute(Packet p) {
                 getContext().getBattleScreen().initializePlayerCamera(v);
             }
         }
+        HashSet<Object> seen=new HashSet<>();
+        getContext().getEntities().vessels.removeIf(e->!seen.add(e.getName()));
     }
 
     @Override

diff --git a/client-core/src/com/benberi/cadesim/client/packet/in/TurnAnimationPacket.java b/client-core/src/com/benberi/cadesim/client/packet/in/TurnAnimationPacket.java
@@ -1,5 +1,7 @@
 package com.benberi.cadesim.client.packet.in;
 
+import java.util.HashSet;
+
 import com.benberi.cadesim.GameContext;
 import com.benberi.cadesim.client.codec.util.Packet;
 import com.benberi.cadesim.client.packet.ClientPacketExecutor;
@@ -44,8 +46,9 @@ public void execute(Packet p) {
             else {
                 p.getBuffer().readerIndex(p.getBuffer().readerIndex() + 16);
             }
-
         }
+        HashSet<Object> seen=new HashSet<>();
+        getContext().getEntities().vessels.removeIf(e->!seen.add(e.getName()));
         getContext().getBattleScreen().setTurnExecute();
     }
 

diff --git a/server/src/com/benberi/cadesim/server/model/player/collision/CollisionCalculator.java b/server/src/com/benberi/cadesim/server/model/player/collision/CollisionCalculator.java
@@ -384,15 +384,14 @@ public boolean performActionCollision(Player player, Position target, int turn,
             		continue;
             	}
             	collide(p, player, turn, phase);
-//            	collide(player, player, turn, phase);
-//            	int playerTile = context.getMap().getTile(player.getX(), player.getY());
-//            	int tile = context.getMap().getTile(p.getX(), p.getY());
-//            	if(context.getMap().isWhirlpool(tile) && context.getMap().isWind(playerTile)) { //below needed to spin ship in place
-//            		p.setFace(p.getFace().getNext());
-//                	p.getAnimationStructure().getTurn(turn).setFace(p.getFace());
-//                	p.getAnimationStructure().getTurn(turn).setSpinCollision(true);
-//                 	player.getAnimationStructure().getTurn(turn).setSpinCollision(false);
-//            	}
+            	int playerTile = context.getMap().getTile(player.getX(), player.getY());
+            	int tile = context.getMap().getTile(p.getX(), p.getY());
+            	if(context.getMap().isWhirlpool(tile) && context.getMap().isWind(playerTile)) { //below needed to spin ship in place
+            		p.setFace(p.getFace().getNext());
+                	p.getAnimationStructure().getTurn(turn).setFace(p.getFace());
+                	p.getAnimationStructure().getTurn(turn).setSpinCollision(true);
+                 	player.getAnimationStructure().getTurn(turn).setSpinCollision(false);
+            	}
             }
             return true;
         }

diff --git a/server/src/com/benberi/cadesim/server/service/GameService.java b/server/src/com/benberi/cadesim/server/service/GameService.java
@@ -129,11 +129,11 @@ else if (
                 playerManager.renewGame();
                 context.getTimeMachine().renewRound(); // bugfix - order matters
                 if(ServerConfiguration.getAISetting() != "off") {
-                    playerManager.spawnAI();	
+                    playerManager.spawnAI();
+                	for(Player other : playerManager.listBots()) {
+                		other.performLogic();
+                	}
                 }
-            	for(Player other : playerManager.listBots()) {
-            		other.performLogic();
-            	}
                 playerManager.serverBroadcastMessage("Started new round: #" + (gamesCompleted + 1));
             }