From ef72eabdf8431e1ff83d0ccff54480edde68e71d Mon Sep 17 00:00:00 2001 From: Michael G <10155689+DarthMDev@users.noreply.github.com> Date: Mon, 11 Sep 2023 05:50:34 -0400 Subject: [PATCH 1/3] DistributedToonHallInterior: Fix missing import issue Should fix #103 --- toontown/building/DistributedToonHallInterior.py | 1 + 1 file changed, 1 insertion(+) diff --git a/toontown/building/DistributedToonHallInterior.py b/toontown/building/DistributedToonHallInterior.py index cfbee85..1fb9d16 100644 --- a/toontown/building/DistributedToonHallInterior.py +++ b/toontown/building/DistributedToonHallInterior.py @@ -1,3 +1,4 @@ +from panda3d.core import * from panda3d.toontown import * from toontown.toonbase.ToonBaseGlobal import * from direct.interval.IntervalGlobal import * From f02cf5d80992373df930892d2ef93c6057916c46 Mon Sep 17 00:00:00 2001 From: demiurgeQuantified <8355611+demiurgeQuantified@users.noreply.github.com> Date: Tue, 31 Oct 2023 18:58:44 +0000 Subject: [PATCH 2/3] fix photo fun memory leak identified in #109 --- toontown/minigame/DistributedPhotoGame.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toontown/minigame/DistributedPhotoGame.py b/toontown/minigame/DistributedPhotoGame.py index 35e1cc2..bcf6096 100644 --- a/toontown/minigame/DistributedPhotoGame.py +++ b/toontown/minigame/DistributedPhotoGame.py @@ -245,6 +245,11 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase): self.removeChildGameFSM(self.gameFSM) del self.gameFSM self.ignoreAll() + + for rayEntry in self.rayArray: + rayEntry[3].remove_node() + del self.rayArray + return def onstage(self): From 347829eb57c94f397e23660174c9c3b625cd624d Mon Sep 17 00:00:00 2001 From: demiurgeQuantified <8355611+demiurgeQuantified@users.noreply.github.com> Date: Tue, 31 Oct 2023 20:25:36 +0000 Subject: [PATCH 3/3] reparent shtickerbook actors when swapping toon torso, fixes #108 --- toontown/toon/Toon.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py index 8cc88c1..75b616b 100644 --- a/toontown/toon/Toon.py +++ b/toontown/toon/Toon.py @@ -860,6 +860,9 @@ class Toon(Avatar.Avatar, ToonHead): self.resetHeight() self.setupToonNodes() self.generateBackpack() + hands = self.getRightHands() + for bookActor, hand in zip(self.__bookActors, hands): + bookActor.reparentTo(hand) def generateToonHead(self, copy = 1): headHeight = ToonHead.generateToonHead(self, copy, self.style, ('1000', '500', '250'))