diff --git a/config/release/dev.prc b/config/release/dev.prc index 48c30c26..7ac6a986 100644 --- a/config/release/dev.prc +++ b/config/release/dev.prc @@ -27,7 +27,6 @@ want-achievements #f # Chat: want-whitelist #f -want-blacklist-sequence #f # Cashbot boss: want-resistance-toonup #t diff --git a/toontown/chat/TTSequenceList.py b/toontown/chat/TTSequenceList.py deleted file mode 100644 index bf467501..00000000 --- a/toontown/chat/TTSequenceList.py +++ /dev/null @@ -1,36 +0,0 @@ -from pandac.PandaModules import * -from otp.chat.SequenceList import SequenceList -from direct.directnotify import DirectNotifyGlobal - -class TTSequenceList(SequenceList): - - def __init__(self): - self.notify = DirectNotifyGlobal.directNotify.newCategory('TTSequenceList') - sequenceListURL = config.GetString('blacklist-sequence-url', '') - if sequenceListURL == '': - self.notify.warning('No Sequence BL URL specified! Continuing with local sequence.') - SequenceList.__init__(self, self.loadSquencesLocally()) - else: - SequenceList.__init__(self, self.downloadSequences(sequenceListURL)) - - def downloadSequences(self, url): - fs = Ramfile() - http = HTTPClient.getGlobalPtr() - self.ch = http.makeChannel(True) - self.ch.getHeader(DocumentSpec(url)) - doc = self.ch.getDocumentSpec() - self.ch.getDocument(doc) - self.ch.downloadToRam(fs) - return fs.getData().split('\r\n') - - def loadSquencesLocally(self): - vfs = VirtualFileSystem.getGlobalPtr() - filename = Filename('tsequence.dat') - searchPath = DSearchPath() - searchPath.appendDirectory(Filename('/server')) - found = vfs.resolveFilename(filename, searchPath) - if not found: - self.notify.warning("Couldn't find blacklist sequence data file!") - return - data = vfs.readFile(filename, True) - return data.split('\n') diff --git a/toontown/suit/DistributedSuitBaseAI.py b/toontown/suit/DistributedSuitBaseAI.py index f11d1d6d..687bdc91 100644 --- a/toontown/suit/DistributedSuitBaseAI.py +++ b/toontown/suit/DistributedSuitBaseAI.py @@ -117,7 +117,6 @@ class DistributedSuitBaseAI(DistributedAvatarAI.DistributedAvatarAI, SuitBase.Su def useSkeleRevive(self): self.skeleRevives -= 1 self.currHP = self.maxHP - self.d_setHP(self.currHP) self.reviveFlag = 1 def reviveCheckAndClear(self): @@ -196,4 +195,4 @@ class DistributedSuitBaseAI(DistributedAvatarAI.DistributedAvatarAI, SuitBase.Su self.d_setWaiter(flag) def getWaiter(self): - return self.waiter + return self.waiter \ No newline at end of file