Merge branch 'develop' into develop_mission_planner

This commit is contained in:
Khopa
2020-10-03 17:06:07 +02:00
6 changed files with 23 additions and 17 deletions

View File

@@ -199,9 +199,9 @@ class Game:
def is_player_attack(self, event):
if isinstance(event, Event):
return event.attacker_name == self.player_name
return event and event.attacker_name and event.attacker_name == self.player_name
else:
return event.name == self.player_name
return event and event.name and event.name == self.player_name
def pass_turn(self, no_action=False, ignored_cps: typing.Collection[ControlPoint] = None):