sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into enhancement/remove-pandac-pandamodules

Browse source
This commit is contained in:
Little Cat 2022-12-28 02:44:41 -04:00
commit 9a95da5bfb
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
toontown/spellbook/ToontownMagicWordManagerAI.py
View file

@ -77,12 +77,11 @@ class ToontownMagicWordManagerAI(DistributedObjectAI.DistributedObjectAI):
self.notify.warning('requestExecuteMagicWord: Magic Word use requested but invoker avatar is non-existent!')
return
# FIXME:
# Same thing with the Toontorial. Magic Words are strictly forbidden here
# Tell the user they can't use it because they're in the Toontorial
# if hasattr(self.air, 'tutorialManager') and avId in list(self.air.tutorialManager.avId2fsm.keys()):
# self.generateResponse(avId=avId, responseType="Tutorial")
# return
if hasattr(self.air, 'tutorialManager') and avId in self.air.tutorialManager.playerDict:
self.generateResponse(avId=avId, responseType="Tutorial")
return
# Our Magic Word affectRange is either SELF (the invoker) or BOTH (invoker and a target)
# Because of this, we should add the invoker to the target list