Project cleanup pre merge.

2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
@@ -17,57 +17,56 @@ import engine.objects.PlayerCharacter;
 */
 public class TaxResourcesMsgHandler extends AbstractClientMsgHandler {

-	public TaxResourcesMsgHandler() {
-		super(TaxResourcesMsg.class);
-	}
+    public TaxResourcesMsgHandler() {
+        super(TaxResourcesMsg.class);
+    }

-	@Override
-	protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException {
+    private static boolean TaxWarehouse(TaxResourcesMsg msg, PlayerCharacter player) {

-		// Member variable declaration
-
-		PlayerCharacter player;
-		TaxResourcesMsg msg;
-
-		player = origin.getPlayerCharacter();
-		if (player == null)
-			return true;
+        // Member variable declaration
+        Building building = BuildingManager.getBuildingFromCache(msg.getBuildingID());


-		msg = (TaxResourcesMsg) baseMsg;
+        if (building == null) {
+            ErrorPopupMsg.sendErrorMsg(player, "Not a valid Building!");
+            return true;
+        }

-		TaxWarehouse(msg,player);
+        City city = building.getCity();
+        if (city == null) {
+            ErrorPopupMsg.sendErrorMsg(player, "This building does not belong to a city.");
+            return true;
+        }
+
+        city.TaxWarehouse(msg, player);


-
-		return true;
-
-	}
-
-	private static boolean TaxWarehouse(TaxResourcesMsg msg, PlayerCharacter player) {
-
-		// Member variable declaration
-		Building building = BuildingManager.getBuildingFromCache(msg.getBuildingID());
+        return true;


-		if (building == null){
-			ErrorPopupMsg.sendErrorMsg(player, "Not a valid Building!");
-			return true;
-		}
+    }

-		City city = building.getCity();
-		if (city == null){
-			ErrorPopupMsg.sendErrorMsg(player, "This building does not belong to a city.");
-			return true;
-		}
+    @Override
+    protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException {

-		city.TaxWarehouse(msg, player);
+        // Member variable declaration
+
+        PlayerCharacter player;
+        TaxResourcesMsg msg;
+
+        player = origin.getPlayerCharacter();
+        if (player == null)
+            return true;


-		return true;
+        msg = (TaxResourcesMsg) baseMsg;
+
+        TaxWarehouse(msg, player);


-	}
+        return true;
+
+    }


 }