From 4573a78499e9af529d3730ffc9ed23d4ae8c9db3 Mon Sep 17 00:00:00 2001 From: Mira <56395159+TheXorog@users.noreply.github.com> Date: Mon, 18 Dec 2023 22:41:52 +0100 Subject: [PATCH] fix: Fix NoSuchMethodError for waterfall ~559 chore: Update jdk chore: Update waterfall proxy to 1.20-R0.2-SNAPSHOT chore: Update protocolize-api to 2.3.2 --- .idea/compiler.xml | 3 - .idea/encodings.xml | 2 + .idea/misc.xml | 3 +- AutoReconnect.iml | 103 ++++++++++++++++++ pom.xml | 16 +-- .../autoreconnect/ReconnectHandler.java | 9 +- .../autoreconnect/net/ReconnectBridge.java | 4 +- 7 files changed, 121 insertions(+), 19 deletions(-) create mode 100644 AutoReconnect.iml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index aaa822a..a499949 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -9,8 +9,5 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index b26911b..af673e7 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -2,5 +2,7 @@ + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index bef35a7..cf300b1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,6 +5,7 @@ + - + \ No newline at end of file diff --git a/AutoReconnect.iml b/AutoReconnect.iml new file mode 100644 index 0000000..3919361 --- /dev/null +++ b/AutoReconnect.iml @@ -0,0 +1,103 @@ + + + + + + + WATERFALL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8bd998..9ddf818 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.aoelite.bungee AutoReconnect - 1.6.11 + 1.6.12 jar AutoReconnect @@ -99,19 +99,19 @@ io.github.waterfallmc waterfall-proxy - 1.19-R0.1-SNAPSHOT + 1.20-R0.2-SNAPSHOT provided - - dev.simplix - protocolize-api - 2.2.2 - provided - org.bstats bstats-bungeecord 3.0.0 + + dev.simplix + protocolize-api + 2.3.2 + provided + diff --git a/src/main/java/me/aoelite/bungee/autoreconnect/ReconnectHandler.java b/src/main/java/me/aoelite/bungee/autoreconnect/ReconnectHandler.java index fd99a24..3e9d501 100644 --- a/src/main/java/me/aoelite/bungee/autoreconnect/ReconnectHandler.java +++ b/src/main/java/me/aoelite/bungee/autoreconnect/ReconnectHandler.java @@ -139,21 +139,20 @@ private void reconnect(UserConnection user, ServerConnection server, String kick newDimension = LimboDimensionType.getLimboCurrentDimension(autoReconnect, version); } short previousGamemode = (short) user.getGamemode(); - user.unsafe().sendPacket(new Login(user.getClientEntityId(), false, (short) 2, - previousGamemode, new HashSet(Arrays.asList(LimboDimensionType.DIMENSION_NAME)), LimboDimensionType.getLimboLoginRegistry(autoReconnect, version), newDimension, - LimboDimensionType.DIMENSION_NAME, 0L, (short) 0, 0, "", 10, 10, false, false, false, false, DEFAULT_LOCATION)); + user.unsafe().sendPacket(new Login(user.getClientEntityId(), false, (short) 2, previousGamemode, new HashSet(Arrays.asList(LimboDimensionType.DIMENSION_NAME)), LimboDimensionType.getLimboLoginRegistry(autoReconnect, version), newDimension, + LimboDimensionType.DIMENSION_NAME, 0L, (short) 0, 0, "", 10, 10, false, false, false, false, false, DEFAULT_LOCATION, 0)); user.setGamemode(2); user.getServerSentScoreboard().clear(); for (UUID bossbar : user.getSentBossBars()) { user.unsafe().sendPacket(new BossBar(bossbar, 1)); } user.getSentBossBars().clear(); - user.unsafe().sendPacket(new Respawn(newDimension, LimboDimensionType.DIMENSION_NAME, 0, (short) 0, (short) 2, previousGamemode, "", false, false, false, DEFAULT_LOCATION)); + user.unsafe().sendPacket(new Respawn(newDimension, LimboDimensionType.DIMENSION_NAME, 0,(short) 0, (short) 2, previousGamemode, "", false, false, (byte)0, DEFAULT_LOCATION, 0)); } else { if (autoReconnect.getConfig().isDebugEnabled()) autoReconnect.getLogger().info("Version pre-1.16"); Object newDim = (Integer) user.getDimension() <= 0 ? 1 : 0; - user.unsafe().sendPacket(new Respawn(newDim, "", 0L, (short) 0, (short) 2, (short) 2, "default", false, false, false, DEFAULT_LOCATION)); + user.unsafe().sendPacket(new Respawn(newDim, "", 0L, (short) 0, (short) 2, (short) 2, "default", false, false, (byte)0, DEFAULT_LOCATION, 0)); user.setGamemode(2); user.setDimension(newDim); user.getServerSentScoreboard().clear(); diff --git a/src/main/java/me/aoelite/bungee/autoreconnect/net/ReconnectBridge.java b/src/main/java/me/aoelite/bungee/autoreconnect/net/ReconnectBridge.java index 29b4414..5a3582d 100644 --- a/src/main/java/me/aoelite/bungee/autoreconnect/net/ReconnectBridge.java +++ b/src/main/java/me/aoelite/bungee/autoreconnect/net/ReconnectBridge.java @@ -139,11 +139,11 @@ public void handle(Kick kick) throws Exception { // .getFallbackServer() ServerInfo def = user.updateAndGetNextServer(server.getInfo()); // Call ServerKickEvent - ServerKickEvent event = bungee.getPluginManager().callEvent(new ServerKickEvent(user, server.getInfo(), ComponentSerializer.parse(kick.getMessage()), def, ServerKickEvent.State.CONNECTED, ServerKickEvent.Cause.SERVER)); + ServerKickEvent event = bungee.getPluginManager().callEvent(new ServerKickEvent(user, server.getInfo(), kick.getMessage(), def, ServerKickEvent.State.CONNECTED, ServerKickEvent.Cause.SERVER)); if (event.isCancelled() && event.getCancelServer() != null) { user.connectNow(event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT); } else { - String kickMessageColor = BaseComponent.toLegacyText(ComponentSerializer.parse(kick.getMessage())); + String kickMessageColor = BaseComponent.toLegacyText(kick.getMessage()); String kickMessage = ChatColor.stripColor(kickMessageColor); // needs to be parsed like that... // doReconnect indicates whether the player should be reconnected or not after // he has been kicked. Only if the kick reason matches the one that has been