Merge pull request #304 from ElGuillermo/master

Fixes an "AttributeError: 'SeedingRulesAutomod'/'LevelThresholdsAutomod' object has no attribute 'player_punish_failed'"
MarechJ · Sep 11, 2023 · 27ecab4 · 27ecab4
2 parents a630736 + 3e5eb2a
commit 27ecab4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/rcon/automods/level_thresholds.py b/rcon/automods/level_thresholds.py
@@ -197,6 +197,14 @@ def get_message(
             )
             return message
 
+    def player_punish_failed(self, aplayer):
+        with self.watch_state(aplayer.team, aplayer.squad) as watch_status:
+            try:
+                if punishes := watch_status.punished.get(aplayer.name):
+                    del punishes[-1]
+            except Exception:
+                self.logger.exception("tried to cleanup punished time but failed")
+
     def punitions_to_apply(
         self,
         team_view,

diff --git a/rcon/automods/seeding_rules.py b/rcon/automods/seeding_rules.py
@@ -216,6 +216,14 @@ def _is_seeding_rule_disabled(self, rule: str) -> bool:
             v = v.decode()
         return v == "1"
 
+    def player_punish_failed(self, aplayer):
+        with self.watch_state(aplayer.team, aplayer.squad) as watch_status:
+            try:
+                if punishes := watch_status.punished.get(aplayer.name):
+                    del punishes[-1]
+            except Exception:
+                self.logger.exception("tried to cleanup punished time but failed")
+
     def punitions_to_apply(
         self,
         team_view,