From 0d1595417d7efb3564d53a1c0aa4f4d7fef36861 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 27 Aug 2015 22:15:41 +0300 Subject: [PATCH] Only toon up after the joke --- toontown/building/DistributedKnockKnockDoor.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/toontown/building/DistributedKnockKnockDoor.py b/toontown/building/DistributedKnockKnockDoor.py index a1bdde91..ac28c792 100755 --- a/toontown/building/DistributedKnockKnockDoor.py +++ b/toontown/building/DistributedKnockKnockDoor.py @@ -53,11 +53,7 @@ class DistributedKnockKnockDoor(DistributedAnimatedProp.DistributedAnimatedProp) def avatarExit(self, avatarId): if avatarId == self.avatarId: - for track in self.avatarTracks: - track.finish() - DelayDelete.cleanupDelayDeletes(track) - - self.avatarTracks = [] + self.stopTracks() def knockKnockTrack(self, avatar, duration): if avatar is None: @@ -96,7 +92,7 @@ class DistributedKnockKnockDoor(DistributedAnimatedProp.DistributedAnimatedProp) return track def cleanupTrack(self): - avatar = self.cr.doId2do.get(self.avatarId, None) + avatar = self.cr.doId2do.get(self.avatarId) if avatar: avatar.clearChat() if self.nametag: @@ -105,7 +101,6 @@ class DistributedKnockKnockDoor(DistributedAnimatedProp.DistributedAnimatedProp) self.nametag.destroy() self.nametag = None self.nametagNP = None - return def enterOff(self): DistributedAnimatedProp.DistributedAnimatedProp.enterOff(self) @@ -132,9 +127,13 @@ class DistributedKnockKnockDoor(DistributedAnimatedProp.DistributedAnimatedProp) def exitPlaying(self): DistributedAnimatedProp.DistributedAnimatedProp.exitPlaying(self) + self.stopTracks() + + def stopTracks(self): for track in self.avatarTracks: - track.finish() + track.pause() DelayDelete.cleanupDelayDeletes(track) + self.cleanupTrack() self.avatarTracks = [] self.avatarId = 0