0.49.7 Testing Branch

megamek/src/megamek/common/GameTurn.java

@@ -63,7 +63,7 @@ public void setPlayerNum(int playerId) {
      * @return <code>true</code> if the specified entity can take this turn.
      *         <code>false</code> if the entity is not valid for this turn.
      */
-    public boolean isValidEntity(Entity entity, Game game) {
+    public boolean isValidEntity(final @Nullable Entity entity, final Game game) {
         return isValidEntity(entity, game, true);
     }
 
@@ -94,17 +94,17 @@ public boolean isValidEntity(final @Nullable Entity entity, final Game game,
                 && (((entity instanceof Infantry) && game.getOptions().booleanOption(OptionsConstants.INIT_INF_MOVE_LATER))
                 || ((entity instanceof Protomech) && game.getOptions().booleanOption(OptionsConstants.INIT_PROTOS_MOVE_LATER)))
                 && game.checkForValidNonInfantryAndOrProtomechs(playerId));
-    }    
+    }
 
     /**
-     * Returns true if the player and entity are both valid.
+     * @return true if the player and entity are both valid.
      */
-    public boolean isValid(int playerId, Entity entity, Game game) {
+    public boolean isValid(final int playerId, final @Nullable Entity entity, final Game game) {
         return (playerId == this.playerId) && isValidEntity(entity, game);
     }
 
     /**
-     * Returns true if the player is valid.
+     * @return true if the player is valid.
      */
     public boolean isValid(int playerId, Game game) {
         return playerId == this.playerId;

megamek/src/megamek/server/Server.java

@@ -13244,15 +13244,12 @@ private void receiveAttack(Packet packet, int connId) {
             turn = game.getTurnForPlayer(connId);
         }
         if ((turn == null) || !turn.isValid(connId, entity, game)) {
-            String msg = "error: server got invalid attack packet from connection " + connId;
-            if (entity != null) {
-                msg += ", Entity: " + entity.getShortName();
-            } else {
-                msg += ", Entity was null!";
-            }
-            LogManager.getLogger().error(msg);
+            LogManager.getLogger().error(String.format(
+                    "Server got invalid attack packet from Connection %s, Entity %s, %s Turn",
+                    connId, ((entity == null) ? "null" : entity.getShortName()),
+                    ((turn == null) ? "null" : "invalid")));
             send(connId, createTurnVectorPacket());
-            send(connId, createTurnIndexPacket(turn.getPlayerNum()));
+            send(connId, createTurnIndexPacket((turn == null) ? Player.PLAYER_NONE : turn.getPlayerNum()));
             return;
         }