From 9123efa6881a29156bda0535eb90490326a4824b Mon Sep 17 00:00:00 2001
From: Alexander <traincrazyb@live.com>
Date: Sun, 23 Aug 2015 21:43:45 -0400
Subject: [PATCH] Yell at jumble for telling me to push this.

---
 toontown/toon/DistributedToon.py   |  2 ++
 toontown/toon/DistributedToonAI.py | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/toontown/toon/DistributedToon.py b/toontown/toon/DistributedToon.py
index 6abd26b5..3c37d63c 100755
--- a/toontown/toon/DistributedToon.py
+++ b/toontown/toon/DistributedToon.py
@@ -1179,6 +1179,8 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
         DistributedSmoothNode.DistributedSmoothNode.d_setParent(self, parentToken)
 
     def setEmoteAccess(self, bits):
+        if bits[26]:
+            bits.remove(bits[26])
         self.emoteAccess = bits
         if self == base.localAvatar:
             messenger.send('emotesChanged')
diff --git a/toontown/toon/DistributedToonAI.py b/toontown/toon/DistributedToonAI.py
index 8da03705..3a1227ad 100755
--- a/toontown/toon/DistributedToonAI.py
+++ b/toontown/toon/DistributedToonAI.py
@@ -163,15 +163,23 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
         self.nextKnockHeal = 0
         self.tfRequest = (0, 0)
         self.epp = []
+        if self.emoteAccess[26]:
+            self.emoteAccess.remove(self.emoteAccess[26])
 
     def generate(self):
         DistributedPlayerAI.DistributedPlayerAI.generate(self)
         DistributedSmoothNodeAI.DistributedSmoothNodeAI.generate(self)
 
+        if self.emoteAccess[26]:
+            self.emoteAccess.remove(self.emoteAccess[26])
+
     def announceGenerate(self):
         DistributedPlayerAI.DistributedPlayerAI.announceGenerate(self)
         DistributedSmoothNodeAI.DistributedSmoothNodeAI.announceGenerate(self)
 
+        if self.emoteAccess[26]:
+            self.emoteAccess.remove(self.emoteAccess[26])
+
         if self.isPlayerControlled():
             messenger.send('avatarEntered', [self])
 
@@ -1951,6 +1959,10 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
         return anyChanged
 
     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.d_setEmoteAccess(bits)
 
@@ -1958,6 +1970,10 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
         self.sendUpdate('setEmoteAccess', [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)
         bits = bits[:maxBitCount]
         bitCount = len(bits)