From 74429800e7908eaac8f9d220ab08fc5a031255e2 Mon Sep 17 00:00:00 2001
From: John <denialmc@outlook.com>
Date: Sun, 21 Jun 2015 22:38:00 +0300
Subject: [PATCH] Battle fix

---
 toontown/suit/DistributedSuitPlannerAI.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/toontown/suit/DistributedSuitPlannerAI.py b/toontown/suit/DistributedSuitPlannerAI.py
index b26cd777..e7ac3a64 100755
--- a/toontown/suit/DistributedSuitPlannerAI.py
+++ b/toontown/suit/DistributedSuitPlannerAI.py
@@ -849,16 +849,8 @@ class DistributedSuitPlannerAI(DistributedObjectAI.DistributedObjectAI, SuitPlan
         pos = self.battlePosDict[canonicalZoneId]
 
         interactivePropTrackBonus = -1
-        if simbase.config.GetBool('props-buff-battles', True) and self.cellToGagBonusDict.has_key(canonicalZoneId):
-            tentativeBonusTrack = self.cellToGagBonusDict[canonicalZoneId]
-            trackToHolidayDict = {
-                ToontownBattleGlobals.SQUIRT_TRACK: ToontownGlobals.HYDRANTS_BUFF_BATTLES,
-                ToontownBattleGlobals.THROW_TRACK: ToontownGlobals.MAILBOXES_BUFF_BATTLES,
-                ToontownBattleGlobals.HEAL_TRACK: ToontownGlobals.TRASHCANS_BUFF_BATTLES }
-            if tentativeBonusTrack in trackToHolidayDict:
-                holidayId = trackToHolidayDict[tentativeBonusTrack]
-                if simbase.air.holidayManager.isHolidayRunning(holidayId):#and simbase.air.holidayManager.getCurPhase(holidayId) >= 1:
-                    interactivePropTrackBonus = tentativeBonusTrack
+        if config.GetBool('props-buff-battles', True) and canonicalZoneId in self.cellToGagBonusDict:
+            interactivePropTrackBonus = self.cellToGagBonusDict[canonicalZoneId]
                     
         self.battleMgr.newBattle(
             zoneId, zoneId, pos, suit, toonId, self.__battleFinished,