Remove unused security and whitelist manager

This commit is contained in:
Daniel 2015-03-04 22:20:10 +02:00
parent 45def83a34
commit e4f8004a81
9 changed files with 1 additions and 133 deletions

View file

@ -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;

View file

@ -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

View file

@ -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()

View file

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

View file

@ -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

View file

@ -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

View file

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

View file

@ -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

View file

@ -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