zontreck/ToonTownRewritten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chat: Only reference whitelist if it's created.

Browse source
This commit is contained in:
Sam Edwards 2013-10-29 20:54:33 -06:00
parent 5f466f3d30
commit 618a7dd382
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/chat/TTChatInputNormal.py
View file

@ -35,13 +35,13 @@ class TTChatInputNormal(ChatInputNormal.ChatInputNormal):
exec 'from toontown.toonbase.ToonBaseGlobal import *' in globals(), self.ExecNamespace
def typeCallback(self, extraArgs):
if localAvatar.chatMgr.chatInputWhiteList.isActive():
if localAvatar.chatMgr.chatInputWhiteList and localAvatar.chatMgr.chatInputWhiteList.isActive():
return
else:
messenger.send('enterNormalChat')
def checkForOverRide(self):
return False
if localAvatar.chatMgr.chatInputWhiteList.isActive():
if localAvatar.chatMgr.chatInputWhiteList and localAvatar.chatMgr.chatInputWhiteList.isActive():
return True
return False

1
toontown/chat/ToontownChatManager.py
View file

@ -56,6 +56,7 @@ class ToontownChatManager(ChatManager.ChatManager):
self.normalPos = Vec3(-1.083, 0, 0.804)
self.whisperPos = Vec3(0.0, 0, 0.71)
self.speedChatPlusPos = Vec3(-0.35, 0, 0.71)
self.chatInputWhiteList = None
#self.chatInputWhiteList = TTChatInputWhiteList()
#if self.defaultToWhiteList:
# self.chatInputNormal = self.chatInputWhiteList