Fixed: DisconnectedPlayer and ReconnectPlayer apply with minimodel not initialized, disconnection countdown when the game is ended. Fixed: the player is now removed from order if it was added before.

2026-05-15 13:36:26 +02:00
parent 6ff79f2e1d
commit f3aaab516f
5 changed files with 19 additions and 11 deletions
@@ -35,10 +35,13 @@ public class DisconnectedPlayer extends NetworkEvent implements  Serializable{
    public boolean apply(MiniModel miniModel){
        if(isError)
            return false;
-        miniModel.setPlayer(player);
-        miniModel.setOrderLogicCard(orderLogicCard);
-        miniModel.setCurrentState(currentState);
-        miniModel.setSlotPlayerMap(slotPlayerMap);
+        if(miniModel!=null)
+        {
+            miniModel.setPlayer(player);
+            miniModel.setOrderLogicCard(orderLogicCard);
+            miniModel.setCurrentState(currentState);
+            miniModel.setSlotPlayerMap(slotPlayerMap);
+        }
        return true;
    }

@@ -33,10 +33,12 @@ public class ReconnectPlayer extends NetworkEvent implements  Serializable{
    public boolean apply(MiniModel miniModel){
        if(isError)
            return false;
-        miniModel.setPlayer(player);
-        miniModel.setOrderLogicCard(orderLogicCard);
-        miniModel.setCurrentState(currentState);
-        miniModel.setSlotPlayerMap(slotPlayerMap);
+        if(miniModel!=null) {
+            miniModel.setPlayer(player);
+            miniModel.setOrderLogicCard(orderLogicCard);
+            miniModel.setCurrentState(currentState);
+            miniModel.setSlotPlayerMap(slotPlayerMap);
+        }
        return true;
    }