From d8d5f0520f69f1c4e965fa45ed30c66e26f788a9 Mon Sep 17 00:00:00 2001 From: MeexReay Date: Sun, 22 Dec 2024 17:49:09 +0300 Subject: [PATCH] unused code remove --- client/dest/script.min.js | 0 server/src/__main__.py | 14 +------------- server/src/player.py | 12 ------------ 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 client/dest/script.min.js diff --git a/client/dest/script.min.js b/client/dest/script.min.js deleted file mode 100644 index e69de29..0000000 diff --git a/server/src/__main__.py b/server/src/__main__.py index 1b3f4a1..df62e90 100644 --- a/server/src/__main__.py +++ b/server/src/__main__.py @@ -1,27 +1,16 @@ -import asyncio, time +import asyncio from network import startServer -from player import Player -from block import Block from world import * from config import * -def current_milli_time(): - return round(time.time() * 1000) - async def tickTimer(): while True: for b in WORLD: await b.tick() await asyncio.sleep(1/20) -async def keepAliveTimer(): - while True: - for b in getPlayers(): - await b.keepAlive() - await asyncio.sleep(1) - async def renderTimer(): while True: for p in getPlayers(): @@ -30,7 +19,6 @@ async def renderTimer(): async def main(): asyncio.get_event_loop().create_task(tickTimer()) - asyncio.get_event_loop().create_task(keepAliveTimer()) asyncio.get_event_loop().create_task(renderTimer()) await startServer(HOST, PORT) diff --git a/server/src/player.py b/server/src/player.py index 6a09ac0..24f06a0 100644 --- a/server/src/player.py +++ b/server/src/player.py @@ -231,25 +231,13 @@ class Player(Block): async def onCollide(self, player, x, y): await super().onCollide(player, x, y) - # if x != 0: - # player.vel_x *= 0.5 - # self.vel_x = player.vel_x - # if y != 0: - # player.vel_y *= 0.5 - # self.vel_y = player.vel_y - # pass async def render(self): self.vel_x *= 0.5 self.vel_y *= 0.5 self.x += self.vel_x self.y += self.vel_y - # await self.setVel(self.vel_x * 0.5, self.vel_y * 0.5) - # await self.setPos(self.x + self.vel_x, self.y + self.vel_y) return self.vel_x != 0 or self.vel_y != 0 - async def keepAlive(self): - await self.sendPacket("R", [str(self.x), str(self.y), str(self.vel_x), str(self.vel_y)]) - def toStatement(self, add=True): return f"P1{self.name},{self.x},{self.y},{self.vel_x},{self.vel_y},{self.color}" if add else f"P0{self.name}"