From 5e90f7ed4349fa330e4ac419aa3104284320f407 Mon Sep 17 00:00:00 2001
From: demiurgeQuantified <8355611+demiurgeQuantified@users.noreply.github.com>
Date: Fri, 10 Nov 2023 06:51:53 +0000
Subject: [PATCH 1/2] minigames: fix client crash when starting tag game

---
 toontown/minigame/DistributedTagGame.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toontown/minigame/DistributedTagGame.py b/toontown/minigame/DistributedTagGame.py
index 59badbc..f522c01 100644
--- a/toontown/minigame/DistributedTagGame.py
+++ b/toontown/minigame/DistributedTagGame.py
@@ -1,5 +1,6 @@
 from panda3d.core import *
 from toontown.toonbase.ToonBaseGlobal import *
+from panda3d.otp import NametagGlobals
 from .DistributedMinigame import *
 from direct.interval.IntervalGlobal import *
 from direct.fsm import ClassicFSM, State

From d4238b8cdb63461f33e876cfd3c60f628d3ef938 Mon Sep 17 00:00:00 2001
From: demiurgeQuantified <8355611+demiurgeQuantified@users.noreply.github.com>
Date: Fri, 10 Nov 2023 06:52:00 +0000
Subject: [PATCH 2/2] minigames: fix tag game collisions not working after
 playing toon escape, resolves #114

---
 toontown/minigame/DistributedTwoDGame.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/toontown/minigame/DistributedTwoDGame.py b/toontown/minigame/DistributedTwoDGame.py
index 3d3c17b..0fe2c1b 100644
--- a/toontown/minigame/DistributedTwoDGame.py
+++ b/toontown/minigame/DistributedTwoDGame.py
@@ -138,8 +138,7 @@ class DistributedTwoDGame(DistributedMinigame):
                 toon.hideName()
                 toon.startSmooth()
                 toon.startLookAround()
-                distCNP = toon.find('**/distAvatarCollNode*')
-                distCNP.node().setIntoCollideMask(BitMask32.allOff())
+                toon.stashBodyCollisions()
                 toonSD = TwoDGameToonSD.TwoDGameToonSD(avId, self)
                 self.toonSDs[avId] = toonSD
                 toonSD.enter()
@@ -255,6 +254,11 @@ class DistributedTwoDGame(DistributedMinigame):
         del self.twoDWalk
         self.twoDDrive = None
         del self.twoDDrive
+
+        for avId in self.remoteAvIdList:
+            toon = self.getAvatar(avId)
+            if toon:
+                toon.unstashBodyCollisions()
         return
 
     def exitCleanup(self):