Skip to content

Commit

Permalink
Merge branch 'main' into public-release
Browse files Browse the repository at this point in the history
  • Loading branch information
TheApplePieGod committed Jan 10, 2025
2 parents 16af00f + 45ea9ea commit e077afd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions battlecode25/engine/game/robot_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ def assert_can_remove_mark(self, loc: MapLocation) -> None:
self.assert_is_robot_type(self.robot.type)
self.assert_can_act_location(loc, GameConstants.MARK_RADIUS_SQUARED)

if self.game.get_marker(loc) == 0:
if self.game.get_marker(self.robot.team, loc) == 0:
raise RobotError("Cannot remove mark from unmarked location")

def can_remove_mark(self, loc: MapLocation) -> bool:
Expand Down Expand Up @@ -764,4 +764,4 @@ def disintegrate(self) -> None:

class RobotError(Exception):
"""Raised for illegal robot inputs"""
pass
pass

0 comments on commit e077afd

Please sign in to comment.