From e4f8004a8111e863e8c4d42f6e1d2d45a3038377 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 4 Mar 2015 22:20:10 +0200 Subject: [PATCH] Remove unused security and whitelist manager --- astron/dclass/toon.dc | 13 -------- otp/distributed/DCClassImports.py | 2 -- .../distributed/ToontownClientRepository.py | 3 +- toontown/uberdog/DistributedSecurityMgr.py | 31 ------------------- toontown/uberdog/DistributedSecurityMgrAI.py | 12 ------- toontown/uberdog/DistributedSecurityMgrUD.py | 12 ------- toontown/uberdog/DistributedWhitelistMgr.py | 31 ------------------- toontown/uberdog/DistributedWhitelistMgrAI.py | 15 --------- toontown/uberdog/DistributedWhitelistMgrUD.py | 15 --------- 9 files changed, 1 insertion(+), 133 deletions(-) delete mode 100644 toontown/uberdog/DistributedSecurityMgr.py delete mode 100644 toontown/uberdog/DistributedSecurityMgrAI.py delete mode 100644 toontown/uberdog/DistributedSecurityMgrUD.py delete mode 100644 toontown/uberdog/DistributedWhitelistMgr.py delete mode 100644 toontown/uberdog/DistributedWhitelistMgrAI.py delete mode 100644 toontown/uberdog/DistributedWhitelistMgrUD.py diff --git a/astron/dclass/toon.dc b/astron/dclass/toon.dc index e3e66088..909a87eb 100644 --- a/astron/dclass/toon.dc +++ b/astron/dclass/toon.dc @@ -286,9 +286,7 @@ from toontown.uberdog.DistributedMailManager/AI/UD import DistributedMailManager from toontown.uberdog.DistributedPartyManager/AI/UD import DistributedPartyManager/AI/UD from toontown.rpc.AwardManager/UD import AwardManager/UD from toontown.uberdog.DistributedCpuInfoMgr/AI/UD import DistributedCpuInfoMgr/AI/UD -from toontown.uberdog.DistributedSecurityMgr/AI/UD import DistributedSecurityMgr/AI/UD from toontown.uberdog.DistributedInGameNewsMgr/AI/UD import DistributedInGameNewsMgr/AI/UD -from toontown.uberdog.DistributedWhitelistMgr/AI/UD import DistributedWhitelistMgr/AI/UD from toontown.coderedemption.TTCodeRedemptionMgr/AI/UD import TTCodeRedemptionMgr/AI/UD from toontown.distributed.NonRepeatableRandomSourceAI import NonRepeatableRandomSourceAI from toontown.distributed.NonRepeatableRandomSourceUD import NonRepeatableRandomSourceUD @@ -3307,11 +3305,6 @@ dclass DistributedCpuInfoMgr : DistributedObjectGlobal { setCpuInfoToUd(uint32, uint32, string, string); }; -dclass DistributedSecurityMgr : DistributedObjectGlobal { - requestAccountId(uint32, uint32, uint32); - requestAccountIdResponse(uint32, uint32) airecv; -}; - dclass NonRepeatableRandomSourceClient { getRandomSamplesReply(uint32, uint32 []) airecv; }; @@ -3336,12 +3329,6 @@ dclass DistributedInGameNewsMgr : DistributedObjectGlobal { newIssueUDtoAI(string) airecv; }; -dclass DistributedWhitelistMgr : DistributedObjectGlobal { - updateWhitelist() broadcast; - whitelistMgrAIStartingUp(uint32, uint32); - newListUDtoAI() airecv; -}; - struct Friend { uint32 doId; diff --git a/otp/distributed/DCClassImports.py b/otp/distributed/DCClassImports.py index 1a3f97f4..e38b8f03 100644 --- a/otp/distributed/DCClassImports.py +++ b/otp/distributed/DCClassImports.py @@ -41,7 +41,6 @@ from toontown.uberdog.DistributedInGameNewsMgr import DistributedInGameNewsMgr from toontown.coghq.InGameEditorDCImports import * from toontown.friends import TTPlayerFriendsManager, TTUFriendsManager from toontown.cogdominium import DistributedCogdoInterior, DistributedCogdoBattleBldg, DistributedCogdoElevatorExt, DistributedCogdoElevatorInt, DistributedCogdoBarrel, DistCogdoGame, DistCogdoLevelGame, DistCogdoBoardroomGame, DistCogdoCraneGame, DistCogdoMazeGame, DistCogdoFlyingGame, DistCogdoCrane, DistCogdoCraneMoneyBag, DistCogdoCraneCog -from toontown.uberdog.DistributedSecurityMgr import DistributedSecurityMgr from otp.distributed import Account, ObjectServer, DistributedDistrict, DistributedDirectory, DistributedTestObject, CentralLogger from toontown.estate import DistributedCannon, DistributedTarget, EstateManager, DistributedEstate, DistributedHouse, DistributedHouseInterior, DistributedGarden, DistributedHouseDoor, DistributedBankMgr, DistributedMailbox, DistributedFurnitureManager, DistributedFurnitureItem, DistributedBank, DistributedCloset, DistributedTrunk, DistributedPhone, DistributedFireworksCannon, DistributedLawnDecor, DistributedGardenPlot, DistributedGardenBox, DistributedFlower, DistributedGagTree, DistributedStatuary, DistributedToonStatuary, DistributedChangingStatuary, DistributedAnimatedStatuary, DistributedPlantBase, DistributedLawnDecor from toontown.toon import DistributedToon, DistributedNPCToonBase, DistributedNPCToon, DistributedSmartNPC, DistributedSmartNPC, DistributedNPCSpecialQuestGiver, DistributedNPCFlippyInToonHall, DistributedNPCScientist, DistributedNPCClerk, DistributedNPCTailor, DistributedNPCBlocker, DistributedNPCFisherman, DistributedNPCPartyPerson, DistributedNPCPetclerk, DistributedNPCKartClerk, DistributedNPCYin, DistributedNPCYang, DistributedNPCBanker @@ -51,7 +50,6 @@ from toontown.distributed.NonRepeatableRandomSourceAI import NonRepeatableRandom from toontown.ai.DistributedMailboxZeroMgr import DistributedMailboxZeroMgr from toontown.uberdog.DistributedDeliveryManager import DistributedDeliveryManager from direct.distributed import DistributedObject, DistributedNode, DistributedSmoothNode, DistributedCartesianGrid, DistributedCamera, DistributedObjectGlobal -from toontown.uberdog.DistributedWhitelistMgr import DistributedWhitelistMgr from otp.ai import TimeManager, MagicWordManager from otp.avatar import DistributedAvatar, DistributedPlayer, AvatarHandle from toontown.battle import DistributedBattleBase, DistributedBattle, DistributedBattleBldg, DistributedBattleFinal, DistributedBattleWaiters, DistributedBattleDiners diff --git a/toontown/distributed/ToontownClientRepository.py b/toontown/distributed/ToontownClientRepository.py index 79057daf..bd6d400f 100644 --- a/toontown/distributed/ToontownClientRepository.py +++ b/toontown/distributed/ToontownClientRepository.py @@ -87,7 +87,6 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository): self.distributedDistrict = None self.partyManager = None self.inGameNewsMgr = None - self.whitelistMgr = None self.toontownTimeManager = ToontownTimeManager.ToontownTimeManager() @@ -587,7 +586,7 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository): else: self.notify.info('dumpAllSubShardObjects: defaultShard is %s' % localAvatar.defaultShard) - ignoredClasses = ('MagicWordManager', 'TimeManager', 'DistributedDistrict', 'FriendManager', 'NewsManager', 'ToontownMagicWordManager', 'WelcomeValleyManager', 'DistributedTrophyMgr', 'CatalogManager', 'DistributedBankMgr', 'EstateManager', 'RaceManager', 'SafeZoneManager', 'DeleteManager', 'TutorialManager', 'ToontownDistrict', 'DistributedDeliveryManager', 'DistributedPartyManager', 'AvatarFriendsManager', 'InGameNewsMgr', 'WhitelistMgr', 'TTCodeRedemptionMgr') + ignoredClasses = ('MagicWordManager', 'TimeManager', 'DistributedDistrict', 'FriendManager', 'NewsManager', 'ToontownMagicWordManager', 'WelcomeValleyManager', 'DistributedTrophyMgr', 'CatalogManager', 'DistributedBankMgr', 'EstateManager', 'RaceManager', 'SafeZoneManager', 'DeleteManager', 'TutorialManager', 'ToontownDistrict', 'DistributedDeliveryManager', 'DistributedPartyManager', 'AvatarFriendsManager', 'InGameNewsMgr', 'TTCodeRedemptionMgr') messenger.send('clientCleanup') for avId, pad in self.__queryAvatarMap.items(): pad.delayDelete.destroy() diff --git a/toontown/uberdog/DistributedSecurityMgr.py b/toontown/uberdog/DistributedSecurityMgr.py deleted file mode 100644 index 98fbf89e..00000000 --- a/toontown/uberdog/DistributedSecurityMgr.py +++ /dev/null @@ -1,31 +0,0 @@ -import socket -import datetime -import os -from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal -from direct.distributed.DistributedObject import DistributedObject -from toontown.toonbase import ToontownGlobals - -class DistributedSecurityMgr(DistributedObject): - notify = directNotify.newCategory('SecurityMgr') - neverDisable = 1 - - def __init__(self, cr): - DistributedObject.__init__(self, cr) - base.cr.whitelistMgr = self - - def delete(self): - DistributedObject.delete(self) - self.cr.whitelistMgr = None - return - - def disable(self): - self.notify.debug("i'm disabling SecurityMgr right now.") - DistributedObject.disable(self) - - def generate(self): - self.notify.debug('BASE: generate') - DistributedObject.generate(self) - - def updateWhitelist(self): - messenger.send('updateWhitelist') - self.notify.info('Updating white list') diff --git a/toontown/uberdog/DistributedSecurityMgrAI.py b/toontown/uberdog/DistributedSecurityMgrAI.py deleted file mode 100644 index 598e2e36..00000000 --- a/toontown/uberdog/DistributedSecurityMgrAI.py +++ /dev/null @@ -1,12 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectGlobalAI import DistributedObjectGlobalAI - -class DistributedSecurityMgrAI(DistributedObjectGlobalAI): - notify = DirectNotifyGlobal.directNotify.newCategory("DistributedSecurityMgrAI") - - def requestAccountId(self, todo0, todo1, todo2): - pass - - def requestAccountIdResponse(self, todo0, todo1): - pass - diff --git a/toontown/uberdog/DistributedSecurityMgrUD.py b/toontown/uberdog/DistributedSecurityMgrUD.py deleted file mode 100644 index 8f22865d..00000000 --- a/toontown/uberdog/DistributedSecurityMgrUD.py +++ /dev/null @@ -1,12 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectGlobalUD import DistributedObjectGlobalUD - -class DistributedSecurityMgrUD(DistributedObjectGlobalUD): - notify = DirectNotifyGlobal.directNotify.newCategory("DistributedSecurityMgrUD") - - def requestAccountId(self, todo0, todo1, todo2): - pass - - def requestAccountIdResponse(self, todo0, todo1): - pass - diff --git a/toontown/uberdog/DistributedWhitelistMgr.py b/toontown/uberdog/DistributedWhitelistMgr.py deleted file mode 100644 index e8672d20..00000000 --- a/toontown/uberdog/DistributedWhitelistMgr.py +++ /dev/null @@ -1,31 +0,0 @@ -import socket -import datetime -import os -from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal -from direct.distributed.DistributedObject import DistributedObject -from toontown.toonbase import ToontownGlobals - -class DistributedWhitelistMgr(DistributedObject): - notify = directNotify.newCategory('WhitelistMgr') - neverDisable = 1 - - def __init__(self, cr): - DistributedObject.__init__(self, cr) - base.cr.whitelistMgr = self - - def delete(self): - DistributedObject.delete(self) - self.cr.whitelistMgr = None - return - - def disable(self): - self.notify.debug("i'm disabling WhitelistMgr right now.") - DistributedObject.disable(self) - - def generate(self): - self.notify.debug('BASE: generate') - DistributedObject.generate(self) - - def updateWhitelist(self): - messenger.send('updateWhitelist') - self.notify.info('Updating white list') diff --git a/toontown/uberdog/DistributedWhitelistMgrAI.py b/toontown/uberdog/DistributedWhitelistMgrAI.py deleted file mode 100644 index 09b9525d..00000000 --- a/toontown/uberdog/DistributedWhitelistMgrAI.py +++ /dev/null @@ -1,15 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectGlobalAI import DistributedObjectGlobalAI - -class DistributedWhitelistMgrAI(DistributedObjectGlobalAI): - notify = DirectNotifyGlobal.directNotify.newCategory("DistributedWhitelistMgrAI") - - def updateWhitelist(self): - pass - - def whitelistMgrAIStartingUp(self, todo0, todo1): - pass - - def newListUDtoAI(self): - pass - diff --git a/toontown/uberdog/DistributedWhitelistMgrUD.py b/toontown/uberdog/DistributedWhitelistMgrUD.py deleted file mode 100644 index dbc9935c..00000000 --- a/toontown/uberdog/DistributedWhitelistMgrUD.py +++ /dev/null @@ -1,15 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectGlobalUD import DistributedObjectGlobalUD - -class DistributedWhitelistMgrUD(DistributedObjectGlobalUD): - notify = DirectNotifyGlobal.directNotify.newCategory("DistributedWhitelistMgrUD") - - def updateWhitelist(self): - pass - - def whitelistMgrAIStartingUp(self, todo0, todo1): - pass - - def newListUDtoAI(self): - pass -