fix trap removal

hannah-y-gao · hannah-y-gao · commit aae3ba39d3c4 · 2026-01-02T22:45:10.000-05:00
diff --git a/engine/src/main/battlecode/server/GameMaker.java b/engine/src/main/battlecode/server/GameMaker.java
@@ -625,10 +625,10 @@ public void addPlaceTrapAction(int trapID, MapLocation loc, Team team, TrapType
             });
         }
 
-        public void addRemoveTrapAction(int trapID, Team team) {
+        public void addRemoveTrapAction(MapLocation loc, Team team) {
             applyToBuilders((builder) -> {
                 byte teamID = TeamMapping.id(team);
-                int action = RemoveTrap.createRemoveTrap(builder, trapID, teamID);
+                int action = RemoveTrap.createRemoveTrap(builder, locationToInt(loc), teamID);
                 builder.addAction(action, Action.RemoveTrap);
             });
         }
diff --git a/engine/src/main/battlecode/world/RobotControllerImpl.java b/engine/src/main/battlecode/world/RobotControllerImpl.java
@@ -371,7 +371,7 @@ public void removeRatTrap(MapLocation loc) throws GameActionException {
         assertCanRemoveRatTrap(loc);
         Trap trap = this.gameWorld.getTrap(loc);
         this.gameWorld.removeTrap(loc);
-        this.gameWorld.getMatchMaker().addRemoveTrapAction(trap.getId(), trap.getTeam());
+        this.gameWorld.getMatchMaker().addRemoveTrapAction(trap.getLocation(), trap.getTeam());
     }
 
     @Override
@@ -405,7 +405,7 @@ public void removeCatTrap(MapLocation loc) throws GameActionException {
         assertCanRemoveCatTrap(loc);
         Trap trap = this.gameWorld.getTrap(loc);
         this.gameWorld.removeTrap(loc);
-        this.gameWorld.getMatchMaker().addRemoveTrapAction(trap.getId(), trap.getTeam());
+        this.gameWorld.getMatchMaker().addRemoveTrapAction(trap.getLocation(), trap.getTeam());
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -625,10 +625,10 @@ public void addPlaceTrapAction(int trapID, MapLocation loc, Team team, TrapType`
`625`	`625`	`});`
`626`	`626`	`}`
`627`	`627`
`628`		`- public void addRemoveTrapAction(int trapID, Team team) {`
	`628`	`+ public void addRemoveTrapAction(MapLocation loc, Team team) {`
`629`	`629`	`applyToBuilders((builder) -> {`
`630`	`630`	`byte teamID = TeamMapping.id(team);`
`631`		`- int action = RemoveTrap.createRemoveTrap(builder, trapID, teamID);`
	`631`	`+ int action = RemoveTrap.createRemoveTrap(builder, locationToInt(loc), teamID);`
`632`	`632`	`builder.addAction(action, Action.RemoveTrap);`
`633`	`633`	`});`
`634`	`634`	`}`