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

safezone: fix daisy gardens flower crash

Browse source
This commit is contained in:
John Cote 2019-12-30 21:08:00 -05:00
parent 25e2ba7e35
commit 67677ad796
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toontown/safezone/DistributedDGFlower.py
View file

@ -9,6 +9,7 @@ class DistributedDGFlower(DistributedObject.DistributedObject):
def __init__(self, cr):
DistributedObject.DistributedObject.__init__(self, cr)
self.flowerRaiseSeq = None
def generate(self):
DistributedObject.DistributedObject.generate(self)
@ -33,7 +34,9 @@ class DistributedDGFlower(DistributedObject.DistributedObject):
def disable(self):
DistributedObject.DistributedObject.disable(self)
taskMgr.remove(self.taskName('DG-flowerRaise'))
if self.flowerRaiseSeq:
self.flowerRaiseSeq.finish()
self.flowerRaiseSeq = None
taskMgr.remove(self.taskName('DG-flowerSpin'))
self.ignore('enterbigFlowerTrigger')
self.ignore('exitbigFlowerTrigger')
@ -57,4 +60,5 @@ class DistributedDGFlower(DistributedObject.DistributedObject):
def setHeight(self, newHeight):
pos = self.bigFlower.getPos()
self.bigFlower.lerpPos(pos[0], pos[1], newHeight, 0.5, task=self.taskName('DG-flowerRaise'))
self.flowerRaiseSeq = self.bigFlower.posInterval(0.5, (pos[0], pos[1], newHeight), name=self.taskName('DG-flowerRaise'))
self.flowerRaiseSeq.start()