From e573dc879d2a93249bcf716765ce5a52145813e6 Mon Sep 17 00:00:00 2001 From: demiurgeQuantified <8355611+demiurgeQuantified@users.noreply.github.com> Date: Fri, 19 May 2023 14:56:07 +0100 Subject: [PATCH 1/4] trolley: fix client crash when matching game ends --- toontown/minigame/DistributedPairingGame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toontown/minigame/DistributedPairingGame.py b/toontown/minigame/DistributedPairingGame.py index 0c70f9c..9fa4964 100644 --- a/toontown/minigame/DistributedPairingGame.py +++ b/toontown/minigame/DistributedPairingGame.py @@ -11,7 +11,7 @@ from toontown.minigame import PlayingCardDeck from toontown.minigame import PairingGameGlobals from .OrthoWalk import OrthoWalk from .OrthoDrive import OrthoDrive -from direct.interval.IntervalGlobal import Sequence, Parallel, Func, LerpColorScaleInterval, LerpScaleInterval, LerpFunctionInterval, Wait, SoundInterval +from direct.interval.IntervalGlobal import Sequence, Parallel, Func, LerpColorScaleInterval, LerpScaleInterval, LerpFunctionInterval, Wait, SoundInterval, WaitInterval from toontown.toonbase.ToontownGlobals import GlobalDialogColor class DistributedPairingGame(DistributedMinigame): From 63051a26cfcd84658b7d39f7b6b92f3b00fe1dd9 Mon Sep 17 00:00:00 2001 From: demiurgeQuantified <8355611+demiurgeQuantified@users.noreply.github.com> Date: Fri, 19 May 2023 14:58:02 +0100 Subject: [PATCH 2/4] trolley: fix client crash when launching early in slingshot game --- toontown/toon/Toon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py index ecfb114..8cc88c1 100644 --- a/toontown/toon/Toon.py +++ b/toontown/toon/Toon.py @@ -1995,7 +1995,7 @@ class Toon(Avatar.Avatar, ToonHead): def exitSitStart(self): self.playingAnim = 'neutral' if self.track != None: - self.track.finish() + self.track.pause() DelayDelete.cleanupDelayDeletes(self.track) self.track = None Emote.globalEmote.releaseBody(self) From 5be4056d2f57b7810e726f0bf5400ed9c63cbbd7 Mon Sep 17 00:00:00 2001 From: demiurgeQuantified <8355611+demiurgeQuantified@users.noreply.github.com> Date: Fri, 19 May 2023 18:44:37 +0100 Subject: [PATCH 3/4] trolley: fix district crash when requesting a minigame --- toontown/spellbook/MagicWordIndex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toontown/spellbook/MagicWordIndex.py b/toontown/spellbook/MagicWordIndex.py index aaf47da..efe856f 100644 --- a/toontown/spellbook/MagicWordIndex.py +++ b/toontown/spellbook/MagicWordIndex.py @@ -335,7 +335,7 @@ class Minigame(MagicWord): mgId = None mgDiff = None if difficulty == 0 else difficulty mgKeep = None - mgSzId = ZoneUtil.getSafeZoneId(toon.zoneId) if isTeleport else None + mgSzId = ZoneUtil.getSafeZoneId(toon.zoneId) if not any ((isTeleport, isRequest)): return f"Unknown command or minigame \"{command}\". Valid commands: \"teleport\", \"request\", or a minigame to automatically teleport or request" From 5814facc54bba9d334a7daf0b5ea315b08cd83b2 Mon Sep 17 00:00:00 2001 From: demiurgeQuantified <8355611+demiurgeQuantified@users.noreply.github.com> Date: Fri, 19 May 2023 23:43:37 +0100 Subject: [PATCH 4/4] trolley: fix new district crash when requesting a minigame --- toontown/spellbook/MagicWordIndex.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/toontown/spellbook/MagicWordIndex.py b/toontown/spellbook/MagicWordIndex.py index efe856f..39eddcb 100644 --- a/toontown/spellbook/MagicWordIndex.py +++ b/toontown/spellbook/MagicWordIndex.py @@ -335,7 +335,7 @@ class Minigame(MagicWord): mgId = None mgDiff = None if difficulty == 0 else difficulty mgKeep = None - mgSzId = ZoneUtil.getSafeZoneId(toon.zoneId) + mgSzId = ZoneUtil.getSafeZoneId(toon.zoneId) if isTeleport else None if not any ((isTeleport, isRequest)): return f"Unknown command or minigame \"{command}\". Valid commands: \"teleport\", \"request\", or a minigame to automatically teleport or request" @@ -350,9 +350,11 @@ class Minigame(MagicWord): mgId = ToontownGlobals.MinigameNames.get(minigame) if any((isTeleport, isRequest)): - if isTeleport and (ZoneUtil.isDynamicZone(toon.zoneId) or not toon.zoneId == mgSzId): - return "Target needs to be in a playground to teleport to a minigame." - MinigameCreatorAI.RequestMinigame[avId] = (mgId, mgKeep, mgDiff, ToontownGlobals.ToontownCentral if ZoneUtil.isWelcomeValley(mgSzId) else mgSzId) + if isTeleport: + if ZoneUtil.isDynamicZone(toon.zoneId) or not toon.zoneId == mgSzId: + return "Target needs to be in a playground to teleport to a minigame." + mgSzId = ToontownGlobals.ToontownCentral if ZoneUtil.isWelcomeValley(mgSzId) else mgSzId + MinigameCreatorAI.RequestMinigame[avId] = (mgId, mgKeep, mgDiff, mgSzId) if isTeleport: try: result = MinigameCreatorAI.createMinigame(self.air, [avId], mgSzId)