Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Yell at jumble for telling me to push this.

Browse source
This commit is contained in:
Alexander 2015-08-23 21:43:45 -04:00
parent 1e3fc86d8c
commit 9123efa688
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/toon/DistributedToon.py
View file

@ -1179,6 +1179,8 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
DistributedSmoothNode.DistributedSmoothNode.d_setParent(self, parentToken) DistributedSmoothNode.DistributedSmoothNode.d_setParent(self, parentToken)
def setEmoteAccess(self, bits): def setEmoteAccess(self, bits):
if bits[26]:
bits.remove(bits[26])
self.emoteAccess = bits self.emoteAccess = bits
if self == base.localAvatar: if self == base.localAvatar:
messenger.send('emotesChanged') messenger.send('emotesChanged')

16
toontown/toon/DistributedToonAI.py
View file

@ -163,15 +163,23 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
self.nextKnockHeal = 0 self.nextKnockHeal = 0
self.tfRequest = (0, 0) self.tfRequest = (0, 0)
self.epp = [] self.epp = []
if self.emoteAccess[26]:
self.emoteAccess.remove(self.emoteAccess[26])
def generate(self): def generate(self):
DistributedPlayerAI.DistributedPlayerAI.generate(self) DistributedPlayerAI.DistributedPlayerAI.generate(self)
DistributedSmoothNodeAI.DistributedSmoothNodeAI.generate(self) DistributedSmoothNodeAI.DistributedSmoothNodeAI.generate(self)
if self.emoteAccess[26]:
self.emoteAccess.remove(self.emoteAccess[26])
def announceGenerate(self): def announceGenerate(self):
DistributedPlayerAI.DistributedPlayerAI.announceGenerate(self) DistributedPlayerAI.DistributedPlayerAI.announceGenerate(self)
DistributedSmoothNodeAI.DistributedSmoothNodeAI.announceGenerate(self) DistributedSmoothNodeAI.DistributedSmoothNodeAI.announceGenerate(self)
if self.emoteAccess[26]:
self.emoteAccess.remove(self.emoteAccess[26])
if self.isPlayerControlled(): if self.isPlayerControlled():
messenger.send('avatarEntered', [self]) messenger.send('avatarEntered', [self])
@ -1951,6 +1959,10 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
return anyChanged return anyChanged
def b_setEmoteAccess(self, bits): def b_setEmoteAccess(self, bits):
if bits[26]:
bits.remove(bits[26])
if self.emoteAccess[26]:
self.emoteAccess.remove(self.emoteAccess[26])
self.setEmoteAccess(bits) self.setEmoteAccess(bits)
self.d_setEmoteAccess(bits) self.d_setEmoteAccess(bits)
@ -1958,6 +1970,10 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
self.sendUpdate('setEmoteAccess', [bits]) self.sendUpdate('setEmoteAccess', [bits])
def setEmoteAccess(self, bits): def setEmoteAccess(self, bits):
if bits[26]:
bits.remove(bits[26])
if self.emoteAccess[26]:
self.emoteAccess.remove(self.emoteAccess[26])
maxBitCount = len(self.emoteAccess) maxBitCount = len(self.emoteAccess)
bits = bits[:maxBitCount] bits = bits[:maxBitCount]
bitCount = len(bits) bitCount = len(bits)