@@ -1,6 +1,18 @@
|
||||
--- a/net/minecraft/server/PlayerConnectionUtils.java
|
||||
+++ b/net/minecraft/server/PlayerConnectionUtils.java
|
||||
@@ -14,6 +14,7 @@
|
||||
--- a/net/minecraft/network/protocol/PlayerConnectionUtils.java
|
||||
+++ b/net/minecraft/network/protocol/PlayerConnectionUtils.java
|
||||
@@ -7,6 +7,11 @@
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
+// CraftBukkit start
|
||||
+import net.minecraft.server.MinecraftServer;
|
||||
+import net.minecraft.server.network.PlayerConnection;
|
||||
+// CraftBukkit end
|
||||
+
|
||||
public class PlayerConnectionUtils {
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
@@ -18,6 +23,7 @@
|
||||
public static <T extends PacketListener> void ensureMainThread(Packet<T> packet, T t0, IAsyncTaskHandler<?> iasynctaskhandler) throws CancelledPacketHandleException {
|
||||
if (!iasynctaskhandler.isMainThread()) {
|
||||
iasynctaskhandler.execute(() -> {
|
||||
@@ -8,7 +20,7 @@
|
||||
if (t0.a().isConnected()) {
|
||||
packet.a(t0);
|
||||
} else {
|
||||
@@ -22,6 +23,10 @@
|
||||
@@ -26,6 +32,10 @@
|
||||
|
||||
});
|
||||
throw CancelledPacketHandleException.INSTANCE;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/net/minecraft/server/PacketPlayInCloseWindow.java
|
||||
+++ b/net/minecraft/server/PacketPlayInCloseWindow.java
|
||||
@@ -8,6 +8,12 @@
|
||||
--- a/net/minecraft/network/protocol/game/PacketPlayInCloseWindow.java
|
||||
+++ b/net/minecraft/network/protocol/game/PacketPlayInCloseWindow.java
|
||||
@@ -10,6 +10,12 @@
|
||||
|
||||
public PacketPlayInCloseWindow() {}
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
--- a/net/minecraft/server/PacketPlayOutMultiBlockChange.java
|
||||
+++ b/net/minecraft/server/PacketPlayOutMultiBlockChange.java
|
||||
@@ -24,7 +24,7 @@
|
||||
--- a/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.java
|
||||
+++ b/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.java
|
||||
@@ -31,7 +31,7 @@
|
||||
short short0 = (Short) shortiterator.next();
|
||||
|
||||
this.b[i] = short0;
|
||||
- this.c[i] = chunksection.getType(SectionPosition.a(short0), SectionPosition.b(short0), SectionPosition.c(short0));
|
||||
+ this.c[i] = (chunksection != null) ? chunksection.getType(SectionPosition.a(short0), SectionPosition.b(short0), SectionPosition.c(short0)) : Blocks.AIR.getBlockData(); // CraftBukkit - SPIGOT-6076, Mojang bug when empty chunk section notified
|
||||
+ this.c[i] = (chunksection != null) ? chunksection.getType(SectionPosition.a(short0), SectionPosition.b(short0), SectionPosition.c(short0)) : net.minecraft.world.level.block.Blocks.AIR.getBlockData(); // CraftBukkit - SPIGOT-6076, Mojang bug when empty chunk section notified
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/net/minecraft/server/PacketPlayOutWorldBorder.java
|
||||
+++ b/net/minecraft/server/PacketPlayOutWorldBorder.java
|
||||
@@ -18,8 +18,10 @@
|
||||
--- a/net/minecraft/network/protocol/game/PacketPlayOutWorldBorder.java
|
||||
+++ b/net/minecraft/network/protocol/game/PacketPlayOutWorldBorder.java
|
||||
@@ -21,8 +21,10 @@
|
||||
|
||||
public PacketPlayOutWorldBorder(WorldBorder worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction packetplayoutworldborder_enumworldborderaction) {
|
||||
this.a = packetplayoutworldborder_enumworldborderaction;
|
||||
|
||||
Reference in New Issue
Block a user