Merge remote-tracking branch 'origin/engine' into client

TheApplePieGod · TheApplePieGod · commit 92418945e648 · 2025-01-06T17:13:18.000-05:00
diff --git a/engine/src/main/battlecode/world/GameWorld.java b/engine/src/main/battlecode/world/GameWorld.java
@@ -131,8 +131,6 @@ public GameWorld(LiveMap gm, RobotControlProvider cp, GameMaker.MatchMaker match
             RobotInfo robot = initialBodies[i];
             MapLocation newLocation = robot.location.translate(gm.getOrigin().x, gm.getOrigin().y);
             spawnRobot(robot.ID, robot.type, newLocation, robot.team);
-            InternalRobot tower = getRobot(newLocation);
-            tower.upgradeTower(tower.getType().getNextLevel());
             this.towerLocations.add(newLocation);
             towersByLoc[locationToIndex(newLocation)] = robot.team;
         }

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,6 @@ public GameWorld(LiveMap gm, RobotControlProvider cp, GameMaker.MatchMaker match`
`131`	`131`	`RobotInfo robot = initialBodies[i];`
`132`	`132`	`MapLocation newLocation = robot.location.translate(gm.getOrigin().x, gm.getOrigin().y);`
`133`	`133`	`spawnRobot(robot.ID, robot.type, newLocation, robot.team);`
`134`		`- InternalRobot tower = getRobot(newLocation);`
`135`		`- tower.upgradeTower(tower.getType().getNextLevel());`
`136`	`134`	`this.towerLocations.add(newLocation);`
`137`	`135`	`towersByLoc[locationToIndex(newLocation)] = robot.team;`
`138`	`136`	`}`