From cbf062ae47d3238bab5acae20283710c26c25486 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Wed, 19 May 2021 18:08:40 +0200 Subject: [PATCH 1/4] 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 177aaf1c24495f9e61121c518ebec024104816b2 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sat, 10 Jul 2021 22:24:42 +0200 Subject: [PATCH 2/4] Add SWCommandUtils SteamWarUser tabcomplete --- SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java b/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java index e6e0ee4..64c735d 100644 --- a/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java +++ b/SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java @@ -19,6 +19,7 @@ package de.steamwar.command; +import de.steamwar.sql.SteamwarUser; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.command.Command; @@ -69,6 +70,7 @@ public class SWCommandUtils { if (s.equals("a") || s.equals("adventure") || s.equals("2")) return GameMode.ADVENTURE; return null; }, s -> Arrays.asList("s", "survival", "0", "c", "creative", "1", "sp", "spectator", "3", "a", "adventure", "2"))); + MAPPER_FUNCTIONS.put(SteamwarUser.class.getTypeName(), createMapper(SteamwarUser::get, s -> Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList()))); } private static void addMapper(Class clazz, Class alternativeClazz, TypeMapper mapper) { From 35bbb2e450a1a5ff472a5f2b8210077a42e2a8a9 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 30 Jul 2021 18:04:38 +0200 Subject: [PATCH 3/4] Trigger build --- SpigotCore_Main/src/de/steamwar/sql/UserConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/SpigotCore_Main/src/de/steamwar/sql/UserConfig.java b/SpigotCore_Main/src/de/steamwar/sql/UserConfig.java index b7a87c3..7c87302 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/UserConfig.java +++ b/SpigotCore_Main/src/de/steamwar/sql/UserConfig.java @@ -64,5 +64,4 @@ public class UserConfig { public static void removePlayerConfig(int id, String config) { SQL.update("DELETE FROM UserConfig WHERE User = ? AND Config = ?", id, config); } - } From 31550da8debefc89bd56782836acaf26612fa61f Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 30 Jul 2021 18:05:24 +0200 Subject: [PATCH 4/4] Trigger build --- SpigotCore_Main/src/de/steamwar/command/TypeMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java b/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java index c0c160c..dce1882 100644 --- a/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java +++ b/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java @@ -29,7 +29,8 @@ public interface TypeMapper { } // For backwards compatibility, can be removed later on - @Deprecated(since = "Use the other map Function without calling super!") + // SINCE="Use the other map Function without calling super!" + @Deprecated default T map(String[] previousArguments, String s) { throw new SecurityException(); }