Merge pull request #1 from open-toontown/develop

Merging 9th Nov 2023

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 *

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):

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'))