Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn

This commit is contained in:
Loudrob 2015-07-22 18:01:04 -04:00
commit a0d8025621

View file

@ -103,7 +103,7 @@ class DistributedFishingSpotAI(DistributedObjectAI):
if self.avId != avId:
self.air.writeServerEvent('suspicious', avId, 'Toon tried to sell fish at a pier they\'re not using!')
return
if self.air.doId2do[pondDoId].getArea() != ToontownGlobals.MyEstate:
if self.air.doId2do[self.pondDoId].getArea() != ToontownGlobals.MyEstate:
self.air.writeServerEvent('suspicious', avId, 'Toon tried to sell fish at a pier not in their estate!')
av = self.air.doId2do[avId]
result = self.air.fishManager.creditFishTank(av)