trueold89
/
mcaio
1
0
Fork 0
Code Pull Requests Packages Releases 3 Activity

BugFix: player list now updated correctly

This commit is contained in:
trueold89 2024-07-13 05:36:41 +03:00
parent 2ae08b8f7e
commit c0b26f1fe0
Signed by: trueold89
GPG Key ID: C122E85DD49E6B30
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mcaio/client.py
View File

@ -46,7 +46,7 @@ class IMCServer(ABC):
@property @property
@abstractmethod @abstractmethod
async def players_count(self) -> int: async def players_count(self) -> int | None:
""" """
Returns current number of players on server Returns current number of players on server
@ -56,7 +56,7 @@ class IMCServer(ABC):
@property @property
@abstractmethod @abstractmethod
async def name(self) -> str: async def name(self) -> str | None:
""" """
Returns server core name Returns server core name
@ -66,7 +66,7 @@ class IMCServer(ABC):
@property @property
@abstractmethod @abstractmethod
async def maxplayers(self) -> int: async def maxplayers(self) -> int | None:
""" """
Returns max number of players available on server Returns max number of players available on server
@ -76,7 +76,7 @@ class IMCServer(ABC):
@property @property
@abstractmethod @abstractmethod
async def motd(self) -> str: async def motd(self) -> str | None:
""" """
Returns Message of the day Returns Message of the day
@ -107,10 +107,10 @@ class IMCServer(ABC):
class AIOMCServer(IMCServer): class AIOMCServer(IMCServer):
_name: str _name: str | None
_max: int _max: int | None
_count: int _count: int | None
_motd: str _motd: str | None
_data: bytes _data: bytes
_players: Iterable _players: Iterable
@ -119,7 +119,7 @@ class AIOMCServer(IMCServer):
self._data = self._pack_data( self._data = self._pack_data(
b"\x00\x00" + self._pack_data(self.host.encode('utf8')) + self. b"\x00\x00" + self._pack_data(self.host.encode('utf8')) + self.
_pack_port(self.port) + b"\x01") _pack_port(self.port) + b"\x01")
self._players = () self.clean()
@staticmethod @staticmethod
async def _unpack_varint(s): async def _unpack_varint(s):
@ -148,6 +148,13 @@ class AIOMCServer(IMCServer):
d = bytes(d, "utf-8") d = bytes(d, "utf-8")
return h + d return h + d
def clean(self) -> None:
self._name = None
self._motd = None
self._max = None
self._count = None
self._players = ()
@staticmethod @staticmethod
def _pack_port(i): def _pack_port(i):
return struct_pack('>H', i) return struct_pack('>H', i)
@ -166,6 +173,7 @@ class AIOMCServer(IMCServer):
async def update(self) -> None: async def update(self) -> None:
data = await self._get_data() data = await self._get_data()
self.clean()
self._name = data["version"]["name"] self._name = data["version"]["name"]
self._motd = data["description"] self._motd = data["description"]
players = data["players"] players = data["players"]
@ -176,22 +184,22 @@ class AIOMCServer(IMCServer):
players["sample"])) players["sample"]))
@property @property
async def players_count(self) -> int: async def players_count(self) -> int | None | None:
await self.update() await self.update()
return self._count return self._count
@property @property
async def name(self) -> str: async def name(self) -> str | None | None:
await self.update() await self.update()
return self._name return self._name
@property @property
async def maxplayers(self) -> int: async def maxplayers(self) -> int | None | None:
await self.update() await self.update()
return self._max return self._max
@property @property
async def motd(self) -> str: async def motd(self) -> str | None | None:
await self.update() await self.update()
return self._motd return self._motd

2
setup.py
View File

@ -6,7 +6,7 @@ long_description = (this_directory / "README.md").read_text()
setup( setup(
name="mcaio", name="mcaio",
version="0.2", version="0.2.1",
url="https://git.orudo.ru/trueold89/mcaio", url="https://git.orudo.ru/trueold89/mcaio",
author="trueold89", author="trueold89",
author_email="trueold89@orudo.ru", author_email="trueold89@orudo.ru",