diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java index 26bf40917..2952fe1bc 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java @@ -137,7 +137,6 @@ public class BukkitNetworkManager implements NetworkManager, Listener, PluginMes private static final String PACKET_DECODER = "craftengine_decoder"; private final boolean hasModelEngine; - private final boolean hasViaVersion; private int[] blockStateRemapper; private int[] modBlockStateRemapper; @@ -148,7 +147,6 @@ public class BukkitNetworkManager implements NetworkManager, Listener, PluginMes this.s2cGamePacketListeners = new ByteBufferPacketListenerHolder[PlayPacketIdHelper.count(PacketFlow.CLIENTBOUND)]; this.c2sGamePacketListeners = new ByteBufferPacketListenerHolder[PlayPacketIdHelper.count(PacketFlow.SERVERBOUND)]; this.hasModelEngine = Bukkit.getPluginManager().getPlugin("ModelEngine") != null; - this.hasViaVersion = Bukkit.getPluginManager().getPlugin("ViaVersion") != null; this.plugin = plugin; // set up packet id this.packetIds = VersionHelper.isOrAbove1_20_5() ? new PacketIds1_20_5() : new PacketIds1_20(); @@ -534,13 +532,9 @@ public class BukkitNetworkManager implements NetworkManager, Listener, PluginMes return hasModelEngine; } - public boolean hasViaVersion() { - return hasViaVersion; - } - public void simulatePacket(@NotNull NetWorkUser player, Object packet) { Channel channel = player.nettyChannel(); - if (channel.isOpen()) { + if (channel != null && channel.isOpen()) { List handlerNames = channel.pipeline().names(); if (handlerNames.contains("via-encoder")) { channel.pipeline().context("via-decoder").fireChannelRead(packet); @@ -673,9 +667,7 @@ public class BukkitNetworkManager implements NetworkManager, Listener, PluginMes String encoderName = pipeline.names().contains("outbound_config") ? "outbound_config" : "encoder"; pipeline.addBefore(encoderName, PACKET_ENCODER, new PluginChannelEncoder(user)); - channel.closeFuture().addListener((ChannelFutureListener) future -> { - handleDisconnection(user.nettyChannel()); - }); + channel.closeFuture().addListener((ChannelFutureListener) future -> handleDisconnection(user.nettyChannel())); setUser(channel, user); } @@ -933,7 +925,7 @@ public class BukkitNetworkManager implements NetworkManager, Listener, PluginMes private void decompress(ChannelHandlerContext ctx, ByteBuf input, ByteBuf output) { ChannelHandler decompressor = ctx.pipeline().get("decompress"); if (decompressor != null) { - ByteBuf temp = (ByteBuf) callDecode(decompressor, ctx, input).get(0); + ByteBuf temp = (ByteBuf) callDecode(decompressor, ctx, input).getFirst(); try { output.clear().writeBytes(temp); } finally { diff --git a/gradle.properties b/gradle.properties index 20d23a1d9..efd0b34c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx1G # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=0.0.63.2 +project_version=0.0.63.3 config_version=45 lang_version=29 project_group=net.momirealms