From 5cf173d60bad2a30c91db2c65a0c17f8462e5381 Mon Sep 17 00:00:00 2001 From: Michal Date: Fri, 14 Feb 2025 20:26:41 +0100 Subject: [PATCH] pridano zapisovani logu kdy je ping zapnut nebo vypnut u editovaneho objektu --- src/jnet/server/ServerMessageParser.java | 60 ++++++++++++++---------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/src/jnet/server/ServerMessageParser.java b/src/jnet/server/ServerMessageParser.java index a78c7a6..7fff2c1 100644 --- a/src/jnet/server/ServerMessageParser.java +++ b/src/jnet/server/ServerMessageParser.java @@ -56,7 +56,7 @@ public class ServerMessageParser { int platform = Integer.parseInt(userData[2]); User u = Database.getUserInfo(username); - + if (PasswordHashing.verify(password, u.getPassword())) { LogFile.printInfo("User: " + username + " logged in (" + ((InetSocketAddress) currentClient.remoteAddress()).getAddress().getHostName() + ")"); // odeslat informaci uzivateli o jeho uspesnem prihlaseni @@ -108,12 +108,12 @@ public class ServerMessageParser { LogFile.printInfo("Authorization failed (ser: " + username + " )"); } break; - + case Message.RESTART: LogFile.printInfo("Prijat pozadavek na restart serveru"); Server.restartServer(); break; - + case Message.UPTIME: long uptime = ManagementFactory.getRuntimeMXBean().getUptime(); send(Message.UPTIME, uptime); @@ -166,14 +166,14 @@ public class ServerMessageParser { for (Map map : Server.maps) { for (MapObject object : map.getObjects()) { if (object.getId() == (int) msg.getMsg()) { - // odebere z databaze - Database.removeObject(object.getId()); - // odesle informaci o odebrani objektu klientum - sendAll(new Message(Message.REMOVE_OBJECT, object.getId())); - // odebere ze seznamu - map.getObjects().remove(object); - break; - } + // odebere z databaze + Database.removeObject(object.getId()); + // odesle informaci o odebrani objektu klientum + sendAll(new Message(Message.REMOVE_OBJECT, object.getId())); + // odebere ze seznamu + map.getObjects().remove(object); + break; + } } } break; @@ -214,15 +214,15 @@ public class ServerMessageParser { for (Map mapa : Server.maps) { for (MapObject object : mapa.getObjects()) { if (object.getId() == data[0]) { - // zmenit pozici - object.setX(data[1]); - object.setY(data[2]); - // zapsat zmenu do databaze - Database.objectMove(data[0], data[1], data[2]); - // preposlat zmenu klientum - sendAll(new Message(Message.UPDATE_OBJECT, object)); - break; - } + // zmenit pozici + object.setX(data[1]); + object.setY(data[2]); + // zapsat zmenu do databaze + Database.objectMove(data[0], data[1], data[2]); + // preposlat zmenu klientum + sendAll(new Message(Message.UPDATE_OBJECT, object)); + break; + } } } break; @@ -234,12 +234,24 @@ public class ServerMessageParser { for (Map m : Server.maps) { for (int i = 0; i < m.getObjects().size(); i++) { if (m.getObjects().get(i).getId() == mo_u.getId()) { - m.getObjects().set(i, mo_u); - break; - } - + // pokud je object vypnuty a dřív nebyl prida log + if (!mo_u.isActive() && m.getObjects().get(i).isActive()) { + Event event_disable = Database.addEvent(mo_u.getId(), "Ping vypnut", Event.TYPE_PING_OFF); + sendAll(new Message(Message.EVENT_NEW, event_disable)); + } + // pokud je object zapnutý a dřív nebyl prida log + if (mo_u.isActive() && !m.getObjects().get(i).isActive()) { + Event event_disable = Database.addEvent(mo_u.getId(), "Ping zapnut", Event.TYPE_PING_OFF); + sendAll(new Message(Message.EVENT_NEW, event_disable)); + } + // zmeni objekt v seznamu + m.getObjects().set(i, mo_u); + break; + } + } } + // preposlat zmenu klientum sendAll(new Message(Message.UPDATE_OBJECT, mo_u)); break;