alemi/aiocraft
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't stop if already stopped

Browse source
This commit is contained in:
əlemi 2022-04-19 01:17:57 +02:00
parent ca45980bcd
commit 022ed83187
No known key found for this signature in database
GPG key ID: BBCBFE5D7244634E
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/aiocraft/client.py
View file

@ -88,7 +88,8 @@ class MinecraftClient:
await self._handshake(ConnectionState.STATUS) await self._handshake(ConnectionState.STATUS)
return await self._status(ping) return await self._status(ping)
finally: finally:
await self.dispatcher.disconnect() if self.dispatcher.connected:
await self.dispatcher.disconnect()
async def join(self, host:str="", port:int=0, proto:int=0): async def join(self, host:str="", port:int=0, proto:int=0):
if self.online_mode: if self.online_mode:
@ -99,7 +100,8 @@ class MinecraftClient:
if await self._login(): if await self._login():
await self._play() await self._play()
finally: finally:
await self.dispatcher.disconnect() if self.dispatcher.connected:
await self.dispatcher.disconnect()
async def _handshake(self, state:ConnectionState): async def _handshake(self, state:ConnectionState):
await self.dispatcher.write( await self.dispatcher.write(

1
src/aiocraft/dispatcher.py
View file

@ -249,6 +249,7 @@ class Dispatcher:
await self._incoming.put(packet) await self._incoming.put(packet)
if self.state != ConnectionState.PLAY: if self.state != ConnectionState.PLAY:
await self._incoming.join() # During play we can pre-process packets await self._incoming.join() # During play we can pre-process packets
except (asyncio.TimeoutError, TimeoutError): except (asyncio.TimeoutError, TimeoutError):
self.logger.error("Connection timed out") self.logger.error("Connection timed out")
await self.disconnect(block=False) await self.disconnect(block=False)