sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client: Don't send previous zones on SetZone.

Browse source
This commit is contained in:
Little Cat 2023-01-10 00:54:35 -04:00
parent d6c98ea1a2
commit 81f64fe57b
No known key found for this signature in database
GPG key ID: 96455BD9C4399BE8
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
toontown/distributed/ToontownClientRepository.py
View file

@ -101,6 +101,7 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
self.old_setzone_interest_handle = None self.old_setzone_interest_handle = None
self.setZoneQueue = Queue() self.setZoneQueue = Queue()
self.accept(ToontownClientRepository.SetZoneDoneEvent, self._handleEmuSetZoneDone) self.accept(ToontownClientRepository.SetZoneDoneEvent, self._handleEmuSetZoneDone)
self.previousInterestZones = None
self._deletedSubShardDoIds = set() self._deletedSubShardDoIds = set()
self.toonNameDict = {} self.toonNameDict = {}
self.gameFSM.addState(State.State('skipTutorialRequest', self.enterSkipTutorialRequest, self.exitSkipTutorialRequest, ['playGame', 'gameOff', 'tutorialQuestion'])) self.gameFSM.addState(State.State('skipTutorialRequest', self.enterSkipTutorialRequest, self.exitSkipTutorialRequest, ['playGame', 'gameOff', 'tutorialQuestion']))
@ -1036,12 +1037,25 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
if op == ToontownClientRepository.SetInterest: if op == ToontownClientRepository.SetInterest:
parentId, interestZones, name = args parentId, interestZones, name = args
if self.old_setzone_interest_handle == None: if self.old_setzone_interest_handle == None:
if interestZones == []:
# Empty zones at startup, don't do anything to save bandwidth, just send the event.
self._handleEmuSetZoneDone()
return
self.old_setzone_interest_handle = self.addInterest(parentId, interestZones, name, ToontownClientRepository.SetZoneDoneEvent) self.old_setzone_interest_handle = self.addInterest(parentId, interestZones, name, ToontownClientRepository.SetZoneDoneEvent)
else: else:
self.alterInterest(self.old_setzone_interest_handle, parentId, interestZones, name, ToontownClientRepository.SetZoneDoneEvent) if type(interestZones) == list:
interestZones.sort()
if self.previousInterestZones == interestZones:
# Don't do anything to save bandwidth, just send the event.
self._handleEmuSetZoneDone()
return
else:
self.alterInterest(self.old_setzone_interest_handle, parentId, interestZones, name, ToontownClientRepository.SetZoneDoneEvent)
self.previousInterestZones = interestZones
elif op == ToontownClientRepository.ClearInterest: elif op == ToontownClientRepository.ClearInterest:
self.removeInterest(self.old_setzone_interest_handle, ToontownClientRepository.SetZoneDoneEvent) self.removeInterest(self.old_setzone_interest_handle, ToontownClientRepository.SetZoneDoneEvent)
self.old_setzone_interest_handle = None self.old_setzone_interest_handle = None
self.previousInterestZones = None
else: else:
self.notify.error('unknown setZone op: %s' % op) self.notify.error('unknown setZone op: %s' % op)
return return