diff options
Diffstat (limited to 'patch-remap/og/net/minecraft/network/protocol/game')
6 files changed, 74 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/network/protocol/game/ClientboundInitializeBorderPacket.patch b/patch-remap/og/net/minecraft/network/protocol/game/ClientboundInitializeBorderPacket.patch new file mode 100644 index 0000000000..fa0dc08cc7 --- /dev/null +++ b/patch-remap/og/net/minecraft/network/protocol/game/ClientboundInitializeBorderPacket.patch @@ -0,0 +1,15 @@ +--- a/net/minecraft/network/protocol/game/ClientboundInitializeBorderPacket.java ++++ b/net/minecraft/network/protocol/game/ClientboundInitializeBorderPacket.java +@@ -27,8 +27,10 @@ + } + + public ClientboundInitializeBorderPacket(WorldBorder worldborder) { +- this.newCenterX = worldborder.getCenterX(); +- this.newCenterZ = worldborder.getCenterZ(); ++ // CraftBukkit start - multiply out nether border ++ this.newCenterX = worldborder.getCenterX() * worldborder.world.dimensionType().coordinateScale(); ++ this.newCenterZ = worldborder.getCenterZ() * worldborder.world.dimensionType().coordinateScale(); ++ // CraftBukkit end + this.oldSize = worldborder.getSize(); + this.newSize = worldborder.getLerpTarget(); + this.lerpTime = worldborder.getLerpRemainingTime(); diff --git a/patch-remap/og/net/minecraft/network/protocol/game/ClientboundSetBorderCenterPacket.patch b/patch-remap/og/net/minecraft/network/protocol/game/ClientboundSetBorderCenterPacket.patch new file mode 100644 index 0000000000..abf12e82da --- /dev/null +++ b/patch-remap/og/net/minecraft/network/protocol/game/ClientboundSetBorderCenterPacket.patch @@ -0,0 +1,15 @@ +--- a/net/minecraft/network/protocol/game/ClientboundSetBorderCenterPacket.java ++++ b/net/minecraft/network/protocol/game/ClientboundSetBorderCenterPacket.java +@@ -10,8 +10,10 @@ + private final double newCenterZ; + + public ClientboundSetBorderCenterPacket(WorldBorder worldborder) { +- this.newCenterX = worldborder.getCenterX(); +- this.newCenterZ = worldborder.getCenterZ(); ++ // CraftBukkit start - multiply out nether border ++ this.newCenterX = worldborder.getCenterX() * (worldborder.world != null ? worldborder.world.dimensionType().coordinateScale() : 1.0); ++ this.newCenterZ = worldborder.getCenterZ() * (worldborder.world != null ? worldborder.world.dimensionType().coordinateScale() : 1.0); ++ // CraftBukkit end + } + + public ClientboundSetBorderCenterPacket(PacketDataSerializer packetdataserializer) { diff --git a/patch-remap/og/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.patch b/patch-remap/og/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.patch new file mode 100644 index 0000000000..380b8686c6 --- /dev/null +++ b/patch-remap/og/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java ++++ b/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.network.protocol.game; + + import net.minecraft.network.PacketDataSerializer; diff --git a/patch-remap/og/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.patch b/patch-remap/og/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.patch new file mode 100644 index 0000000000..760a854cd4 --- /dev/null +++ b/patch-remap/og/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java ++++ b/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.network.protocol.game; + + import net.minecraft.network.PacketDataSerializer; diff --git a/patch-remap/og/net/minecraft/network/protocol/game/PacketPlayInUseItem.patch b/patch-remap/og/net/minecraft/network/protocol/game/PacketPlayInUseItem.patch new file mode 100644 index 0000000000..9475518bd9 --- /dev/null +++ b/patch-remap/og/net/minecraft/network/protocol/game/PacketPlayInUseItem.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/network/protocol/game/PacketPlayInUseItem.java ++++ b/net/minecraft/network/protocol/game/PacketPlayInUseItem.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.network.protocol.game; + + import net.minecraft.network.PacketDataSerializer; diff --git a/patch-remap/og/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.patch b/patch-remap/og/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.patch new file mode 100644 index 0000000000..06f07964d1 --- /dev/null +++ b/patch-remap/og/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.patch @@ -0,0 +1,23 @@ +--- a/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.java ++++ b/net/minecraft/network/protocol/game/PacketPlayOutMultiBlockChange.java +@@ -30,11 +30,19 @@ + short short0 = (Short) shortiterator.next(); + + this.positions[j] = short0; +- this.states[j] = chunksection.getBlockState(SectionPosition.sectionRelativeX(short0), SectionPosition.sectionRelativeY(short0), SectionPosition.sectionRelativeZ(short0)); ++ this.states[j] = (chunksection != null) ? chunksection.getBlockState(SectionPosition.sectionRelativeX(short0), SectionPosition.sectionRelativeY(short0), SectionPosition.sectionRelativeZ(short0)) : net.minecraft.world.level.block.Blocks.AIR.defaultBlockState(); // CraftBukkit - SPIGOT-6076, Mojang bug when empty chunk section notified + } + + } + ++ // CraftBukkit start - Add constructor ++ public PacketPlayOutMultiBlockChange(SectionPosition sectionposition, ShortSet shortset, IBlockData[] states) { ++ this.sectionPos = sectionposition; ++ this.positions = shortset.toShortArray(); ++ this.states = states; ++ } ++ // CraftBukkit end ++ + public PacketPlayOutMultiBlockChange(PacketDataSerializer packetdataserializer) { + this.sectionPos = SectionPosition.of(packetdataserializer.readLong()); + int i = packetdataserializer.readVarInt(); |