From cbf062ae47d3238bab5acae20283710c26c25486 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Wed, 19 May 2021 18:08:40 +0200 Subject: [PATCH 1/2] Baumember update packet --- SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java | 1 + SpigotCore_Main/src/de/steamwar/comms/PacketIdManager.java | 1 + SpigotCore_Main/src/de/steamwar/sql/BauweltMember.java | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java b/SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java index 96e9e3a..594e82b 100644 --- a/SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java +++ b/SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java @@ -51,6 +51,7 @@ public class BungeeReceiver implements PluginMessageListener { } }); + registerHandler(PacketIdManager.BAUMEMBER_UPDATE, byteArrayDataInput -> BauweltMember.clear()); registerHandler(PacketIdManager.INVENTORY_PACKET, new InventoryHandler()); registerHandler(PacketIdManager.INVENTORY_CLOSE_PACKET, byteArrayDataInput -> { Player player = Bukkit.getPlayer(SteamwarUser.get(byteArrayDataInput.readInt()).getUUID()); diff --git a/SpigotCore_Main/src/de/steamwar/comms/PacketIdManager.java b/SpigotCore_Main/src/de/steamwar/comms/PacketIdManager.java index 97a7d9b..b326674 100644 --- a/SpigotCore_Main/src/de/steamwar/comms/PacketIdManager.java +++ b/SpigotCore_Main/src/de/steamwar/comms/PacketIdManager.java @@ -25,6 +25,7 @@ public class PacketIdManager { public final static byte PING_PACKET = 0x01; public final static byte TABLIST_NAME = 0x02; public static final byte PREPARE_SCHEM = 0x03; + public final static byte BAUMEMBER_UPDATE = 0x04; //0x1(X) Bungee Inventory public final static byte INVENTORY_PACKET = 0x10; public final static byte INVENTORY_CALLBACK_PACKET = 0x11; diff --git a/SpigotCore_Main/src/de/steamwar/sql/BauweltMember.java b/SpigotCore_Main/src/de/steamwar/sql/BauweltMember.java index 4e0ed39..622b545 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/BauweltMember.java +++ b/SpigotCore_Main/src/de/steamwar/sql/BauweltMember.java @@ -34,6 +34,10 @@ public class BauweltMember{ private static final List members = new ArrayList<>(); + public static void clear() { + members.clear(); + } + private BauweltMember(int ownerID, int memberID, boolean worldEdit, boolean world, boolean updateDB){ bauweltID = ownerID; this.memberID = memberID; From 98c2ae397b94dbda8c88a2ad48b8a8b9d52413c3 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Mon, 24 May 2021 09:07:53 +0200 Subject: [PATCH 2/2] Change not logged messages --- SpigotCore_Main/src/de/steamwar/sql/SWException.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SpigotCore_Main/src/de/steamwar/sql/SWException.java b/SpigotCore_Main/src/de/steamwar/sql/SWException.java index 0bbfb8b..efee8ad 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/SWException.java +++ b/SpigotCore_Main/src/de/steamwar/sql/SWException.java @@ -35,7 +35,6 @@ public class SWException { static { List reasons = new ArrayList<>(); - reasons.add("Initializing Legacy Material Support."); reasons.add("Could not save the list after adding a user."); reasons.add("Could not save spigot.yml"); reasons.add("Failed to save operators list:"); @@ -68,6 +67,9 @@ public class SWException { reasons.add("Ignoring unknown attribute"); reasons.add("Skipping player strafe phase because no player was found"); reasons.add("Couldn't save chunk; already in use by another instance of Minecraft?"); + reasons.add("Failed to save player data for "); + reasons.add("Failed to check session lock for world located at"); + reasons.add("Saving oversized chunk "); ignorereasons = Collections.unmodifiableList(reasons); }