From 2f6e16a293e54de2d7894b1cae317efeedafc419 Mon Sep 17 00:00:00 2001
From: John Cote <jwcotejr@users.noreply.github.com>
Date: Mon, 30 Dec 2019 20:37:37 -0500
Subject: [PATCH] battle: fix more crashes with street battles

---
 toontown/battle/Movie.py       | 3 ++-
 toontown/battle/MovieDrop.py   | 3 ++-
 toontown/battle/MovieFire.py   | 3 ++-
 toontown/battle/MovieSquirt.py | 3 ++-
 toontown/battle/MovieThrow.py  | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/toontown/battle/Movie.py b/toontown/battle/Movie.py
index a50c94d..248b9dc 100644
--- a/toontown/battle/Movie.py
+++ b/toontown/battle/Movie.py
@@ -28,6 +28,7 @@ from toontown.toon import Toon
 from toontown.toonbase import ToontownGlobals
 from toontown.toontowngui import TTDialog
 import copy
+import functools
 from toontown.toonbase import TTLocalizer
 from toontown.toon import NPCToons
 camPos = Point3(14, 0, 10)
@@ -778,7 +779,7 @@ class Movie(DirectObject.DirectObject):
                 return -1
             return 0
 
-        self.toonAttackDicts.sort(compFunc)
+        self.toonAttackDicts.sort(key=functools.cmp_to_key(compFunc))
         return
 
     def __findToonAttack(self, track):
diff --git a/toontown/battle/MovieDrop.py b/toontown/battle/MovieDrop.py
index 084e758..60d39a0 100644
--- a/toontown/battle/MovieDrop.py
+++ b/toontown/battle/MovieDrop.py
@@ -8,6 +8,7 @@ from . import MovieUtil
 from . import MovieNPCSOS
 from .MovieUtil import calcAvgSuitPos
 from direct.showutil import Effects
+import functools
 notify = DirectNotifyGlobal.directNotify.newCategory('MovieDrop')
 hitSoundFiles = ('AA_drop_flowerpot.mp3', 'AA_drop_sandbag.mp3', 'AA_drop_anvil.mp3', 'AA_drop_bigweight.mp3', 'AA_drop_safe.mp3', 'AA_drop_piano.mp3', 'AA_drop_boat.mp3')
 missSoundFiles = ('AA_drop_flowerpot_miss.mp3', 'AA_drop_sandbag_miss.mp3', 'AA_drop_anvil_miss.mp3', 'AA_drop_bigweight_miss.mp3', 'AA_drop_safe_miss.mp3', 'AA_drop_piano_miss.mp3', 'AA_drop_boat_miss.mp3')
@@ -68,7 +69,7 @@ def doDrops(drops):
             return -1
         return 0
 
-    suitDrops.sort(compFunc)
+    suitDrops.sort(key=functools.cmp_to_key(compFunc))
     delay = 0.0
     mtrack = Parallel(name='toplevel-drop')
     npcDrops = {}
diff --git a/toontown/battle/MovieFire.py b/toontown/battle/MovieFire.py
index a87871f..6a0a968 100644
--- a/toontown/battle/MovieFire.py
+++ b/toontown/battle/MovieFire.py
@@ -7,6 +7,7 @@ from toontown.toon.ToonDNA import *
 from toontown.suit.SuitDNA import *
 from direct.directnotify import DirectNotifyGlobal
 import random
+import functools
 from . import MovieCamera
 from . import MovieUtil
 from .MovieUtil import calcAvgSuitPos
@@ -45,7 +46,7 @@ def doFires(fires):
         elif len(a) < len(b):
             return -1
         return 0
-    suitFires.sort(compFunc)
+    suitFires.sort(key=functools.cmp_to_key(compFunc))
 
     totalHitDict = {}
     singleHitDict = {}
diff --git a/toontown/battle/MovieSquirt.py b/toontown/battle/MovieSquirt.py
index 600a2e0..f3afc7d 100644
--- a/toontown/battle/MovieSquirt.py
+++ b/toontown/battle/MovieSquirt.py
@@ -11,6 +11,7 @@ from . import BattleParticles
 from toontown.toonbase import ToontownGlobals
 from toontown.toonbase import ToontownBattleGlobals
 import random
+import functools
 notify = DirectNotifyGlobal.directNotify.newCategory('MovieSquirt')
 hitSoundFiles = ('AA_squirt_flowersquirt.mp3', 'AA_squirt_glasswater.mp3', 'AA_squirt_neonwatergun.mp3', 'AA_squirt_seltzer.mp3', 'firehose_spray.mp3', 'AA_throw_stormcloud.mp3', 'AA_squirt_Geyser.mp3')
 missSoundFiles = ('AA_squirt_flowersquirt_miss.mp3', 'AA_squirt_glasswater_miss.mp3', 'AA_squirt_neonwatergun_miss.mp3', 'AA_squirt_seltzer_miss.mp3', 'firehose_spray.mp3', 'AA_throw_stormcloud_miss.mp3', 'AA_squirt_Geyser.mp3')
@@ -57,7 +58,7 @@ def doSquirts(squirts):
         elif len(a) < len(b):
             return -1
         return 0
-    suitSquirts.sort(compFunc)
+    suitSquirts.sort(key=functools.cmp_to_key(compFunc))
 
     delay = 0.0
 
diff --git a/toontown/battle/MovieThrow.py b/toontown/battle/MovieThrow.py
index 55822f7..0a558ed 100644
--- a/toontown/battle/MovieThrow.py
+++ b/toontown/battle/MovieThrow.py
@@ -7,6 +7,7 @@ from toontown.toon.ToonDNA import *
 from toontown.suit.SuitDNA import *
 from direct.directnotify import DirectNotifyGlobal
 import random
+import functools
 from . import MovieCamera
 from . import MovieUtil
 from .MovieUtil import calcAvgSuitPos
@@ -49,7 +50,7 @@ def doThrows(throws):
             return -1
         return 0
 
-    suitThrows.sort(compFunc)
+    suitThrows.sort(key=functools.cmp_to_key(compFunc))
     totalHitDict = {}
     singleHitDict = {}
     groupHitDict = {}