forked from SteamWar/SteamWar
Add debug output to TinyProtocol
This commit is contained in:
@@ -31,15 +31,6 @@ dependencies {
|
|||||||
implementation(project(":BauSystem:BauSystem_Main"))
|
implementation(project(":BauSystem:BauSystem_Main"))
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register<DevServer>("DevBau20") {
|
|
||||||
group = "run"
|
|
||||||
description = "Run a 1.20 Dev Bau"
|
|
||||||
dependsOn(":SpigotCore:shadowJar")
|
|
||||||
dependsOn(":BauSystem:shadowJar")
|
|
||||||
dependsOn(":SchematicSystem:shadowJar")
|
|
||||||
template = "Bau20"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register<DevServer>("DevBau21") {
|
tasks.register<DevServer>("DevBau21") {
|
||||||
group = "run"
|
group = "run"
|
||||||
description = "Run a 1.21 Dev Bau"
|
description = "Run a 1.21 Dev Bau"
|
||||||
|
|||||||
@@ -356,6 +356,8 @@ public class TinyProtocol {
|
|||||||
|
|
||||||
// Lookup channel again
|
// Lookup channel again
|
||||||
if (channel == null) {
|
if (channel == null) {
|
||||||
|
System.out.println(((CraftPlayer) player).getHandle());
|
||||||
|
System.out.println(((CraftPlayer) player).getHandle().connection);
|
||||||
Channel playerChannel = ((CraftPlayer) player).getHandle().connection.connection.channel;
|
Channel playerChannel = ((CraftPlayer) player).getHandle().connection.connection.channel;
|
||||||
channelLookup.put(player.getName(), channel = playerChannel);
|
channelLookup.put(player.getName(), channel = playerChannel);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import de.steamwar.Reflection;
|
|||||||
import de.steamwar.sql.internal.Statement;
|
import de.steamwar.sql.internal.Statement;
|
||||||
import io.netty.channel.ChannelFuture;
|
import io.netty.channel.ChannelFuture;
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
import net.minecraft.server.network.ServerConnectionListener;
|
import net.minecraft.server.network.ServerConnectionListener;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.craftbukkit.CraftWorld;
|
import org.bukkit.craftbukkit.CraftWorld;
|
||||||
@@ -79,11 +80,14 @@ class CheckpointUtilsJ9 {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
e.printStackTrace();
|
||||||
|
|
||||||
Bukkit.shutdown();
|
Bukkit.shutdown();
|
||||||
|
|
||||||
if (!message.contains("Can't dump ghost file") && !message.contains("Can't create link remap")) // File/Jar has been updated
|
if (!message.contains("Can't dump ghost file") && !message.contains("Can't create link remap")) // File/Jar has been updated
|
||||||
throw new SecurityException(e);
|
throw new SecurityException(e);
|
||||||
} finally {
|
} finally {
|
||||||
|
if (true) return;
|
||||||
// Delete checkpoint
|
// Delete checkpoint
|
||||||
try (Stream<Path> stream = Files.walk(path)) {
|
try (Stream<Path> stream = Files.walk(path)) {
|
||||||
stream.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
|
stream.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
|
||||||
@@ -108,6 +112,7 @@ class CheckpointUtilsJ9 {
|
|||||||
ServerConnectionListener serverConnection = MinecraftServer.getServer().getConnection();
|
ServerConnectionListener serverConnection = MinecraftServer.getServer().getConnection();
|
||||||
List<?> channels = channelFutures.get(serverConnection);
|
List<?> channels = channelFutures.get(serverConnection);
|
||||||
for (Object future : channels) {
|
for (Object future : channels) {
|
||||||
|
System.out.println(((ChannelFuture) future).channel() + ": " + ((ChannelFuture) future).channel().pipeline().names());
|
||||||
((ChannelFuture) future).channel().close().syncUninterruptibly();
|
((ChannelFuture) future).channel().close().syncUninterruptibly();
|
||||||
}
|
}
|
||||||
channels.clear();
|
channels.clear();
|
||||||
@@ -143,10 +148,15 @@ class CheckpointUtilsJ9 {
|
|||||||
// Reopen socket
|
// Reopen socket
|
||||||
serverConnection.startTcpServerListener(InetAddress.getLoopbackAddress(), port);
|
serverConnection.startTcpServerListener(InetAddress.getLoopbackAddress(), port);
|
||||||
for (Object future : channels) {
|
for (Object future : channels) {
|
||||||
|
System.out.println(((ChannelFuture) future).channel() + ": " + ((ChannelFuture) future).channel().pipeline().names());
|
||||||
((ChannelFuture) future).channel().config().setAutoRead(true);
|
((ChannelFuture) future).channel().config().setAutoRead(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
Bukkit.getPluginManager().callEvent(new CRIUWakeupEvent());
|
Bukkit.getPluginManager().callEvent(new CRIUWakeupEvent());
|
||||||
Core.getInstance().getLogger().log(Level.INFO, "Checkpoint restored");
|
Core.getInstance().getLogger().log(Level.INFO, "Checkpoint restored");
|
||||||
|
|
||||||
|
for (ServerPlayer player : MinecraftServer.getServer().getPlayerList().players) {
|
||||||
|
System.out.println(player);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user