diff --git a/BauSystem/build.gradle.kts b/BauSystem/build.gradle.kts index 574ee012..de9fe1b8 100644 --- a/BauSystem/build.gradle.kts +++ b/BauSystem/build.gradle.kts @@ -31,15 +31,6 @@ dependencies { implementation(project(":BauSystem:BauSystem_Main")) } -tasks.register("DevBau20") { - group = "run" - description = "Run a 1.20 Dev Bau" - dependsOn(":SpigotCore:shadowJar") - dependsOn(":BauSystem:shadowJar") - dependsOn(":SchematicSystem:shadowJar") - template = "Bau20" -} - tasks.register("DevBau21") { group = "run" description = "Run a 1.21 Dev Bau" diff --git a/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java index 59def653..4f00dada 100644 --- a/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java +++ b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java @@ -356,6 +356,8 @@ public class TinyProtocol { // Lookup channel again if (channel == null) { + System.out.println(((CraftPlayer) player).getHandle()); + System.out.println(((CraftPlayer) player).getHandle().connection); Channel playerChannel = ((CraftPlayer) player).getHandle().connection.connection.channel; channelLookup.put(player.getName(), channel = playerChannel); } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java index 176715ab..19a78753 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java @@ -24,6 +24,7 @@ import de.steamwar.Reflection; import de.steamwar.sql.internal.Statement; import io.netty.channel.ChannelFuture; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerConnectionListener; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.CraftWorld; @@ -79,11 +80,14 @@ class CheckpointUtilsJ9 { return; } + e.printStackTrace(); + Bukkit.shutdown(); if (!message.contains("Can't dump ghost file") && !message.contains("Can't create link remap")) // File/Jar has been updated throw new SecurityException(e); } finally { + if (true) return; // Delete checkpoint try (Stream stream = Files.walk(path)) { stream.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete); @@ -108,6 +112,7 @@ class CheckpointUtilsJ9 { ServerConnectionListener serverConnection = MinecraftServer.getServer().getConnection(); List channels = channelFutures.get(serverConnection); for (Object future : channels) { + System.out.println(((ChannelFuture) future).channel() + ": " + ((ChannelFuture) future).channel().pipeline().names()); ((ChannelFuture) future).channel().close().syncUninterruptibly(); } channels.clear(); @@ -143,10 +148,15 @@ class CheckpointUtilsJ9 { // Reopen socket serverConnection.startTcpServerListener(InetAddress.getLoopbackAddress(), port); for (Object future : channels) { + System.out.println(((ChannelFuture) future).channel() + ": " + ((ChannelFuture) future).channel().pipeline().names()); ((ChannelFuture) future).channel().config().setAutoRead(true); } Bukkit.getPluginManager().callEvent(new CRIUWakeupEvent()); Core.getInstance().getLogger().log(Level.INFO, "Checkpoint restored"); + + for (ServerPlayer player : MinecraftServer.getServer().getPlayerList().players) { + System.out.println(player); + } } }