From df7eb9f31ff7c062d8cc15980ab26ad5c7e2143a Mon Sep 17 00:00:00 2001 From: 0x_Hazel <0x.voidweaver@gmail.com> Date: Sun, 14 Jan 2024 03:26:41 +0000 Subject: [PATCH] Remove encounters with non-characters --- commands/encounter_cmdset.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/commands/encounter_cmdset.py b/commands/encounter_cmdset.py index 13d106b..dd11a22 100644 --- a/commands/encounter_cmdset.py +++ b/commands/encounter_cmdset.py @@ -2,6 +2,9 @@ from commands.command import Command from evennia import create_script from evennia import CmdSet +from evennia.utils import inherits_from +import typeclasses.characters + class EncounterCommand(Command): energy_cost = 1 allow_self_target = False @@ -185,6 +188,9 @@ class CmdEngage(Command): target = self.caller.search(self.args) if not target: return + if not inherits_from(target, typeclasses.characters.Character): + self.caller.msg(target.db.engage_err_msg or "You can't initiate an encounter with that.") + return if target == self.caller: self.caller.msg("You can't initiate an encounter with yourself!") return