From c03b8b99e3aaf530940da837ed5ff4ce3de6c419 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 23 Nov 2021 16:20:31 -0800 Subject: [PATCH] even more patches --- ...the-default-permission-message-configurable.patch | 0 .../Don-t-allow-digging-into-unloaded-chunks.patch | 0 .../server/Fix-SpongeAbsortEvent-handling.patch | 0 .../Handle-Large-Packets-disconnecting-client.patch | 12 ++++++------ ...the-default-permission-message-configurable.patch | 0 .../server/Optimize-World-Time-Updates.patch | 0 .../Prevent-rayTrace-from-loading-chunks.patch | 2 +- .../Restore-custom-InventoryHolder-support.patch | 0 .../server/Use-Vanilla-Minecart-Speeds.patch | 0 todo.txt | 1 + 10 files changed, 8 insertions(+), 7 deletions(-) rename patches/{unapplied => }/api/Make-the-default-permission-message-configurable.patch (100%) rename patches/{unapplied => }/server/Don-t-allow-digging-into-unloaded-chunks.patch (100%) rename patches/{unapplied => }/server/Fix-SpongeAbsortEvent-handling.patch (100%) rename patches/{unapplied => }/server/Handle-Large-Packets-disconnecting-client.patch (93%) rename patches/{unapplied => }/server/Make-the-default-permission-message-configurable.patch (100%) rename patches/{unapplied => }/server/Optimize-World-Time-Updates.patch (100%) rename patches/{unapplied => }/server/Prevent-rayTrace-from-loading-chunks.patch (94%) rename patches/{unapplied => }/server/Restore-custom-InventoryHolder-support.patch (100%) rename patches/{unapplied => }/server/Use-Vanilla-Minecart-Speeds.patch (100%) diff --git a/patches/unapplied/api/Make-the-default-permission-message-configurable.patch b/patches/api/Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/unapplied/api/Make-the-default-permission-message-configurable.patch rename to patches/api/Make-the-default-permission-message-configurable.patch diff --git a/patches/unapplied/server/Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/unapplied/server/Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch b/patches/server/Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/unapplied/server/Fix-SpongeAbsortEvent-handling.patch rename to patches/server/Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch b/patches/server/Handle-Large-Packets-disconnecting-client.patch similarity index 93% rename from patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch rename to patches/server/Handle-Large-Packets-disconnecting-client.patch index 7d631e757c..0bdf7443bd 100644 --- a/patches/unapplied/server/Handle-Large-Packets-disconnecting-client.patch +++ b/patches/server/Handle-Large-Packets-disconnecting-client.patch @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/network/PacketEncoder.java +++ b/src/main/java/net/minecraft/network/PacketEncoder.java @@ -0,0 +0,0 @@ public class PacketEncoder extends MessageToByteEncoder> { - throw var9; + throw var10; } } + @@ -100,13 +100,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @Override public void write(FriendlyByteBuf buf) { buf.writeByte(this.containerId); -diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java +diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java -+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacket.java -@@ -0,0 +0,0 @@ public class ClientboundLevelChunkPacket implements Packet 2097152) { + if (i > 2097152) { // Paper - diff on change - if this changes, update PacketEncoder diff --git a/patches/unapplied/server/Make-the-default-permission-message-configurable.patch b/patches/server/Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/unapplied/server/Make-the-default-permission-message-configurable.patch rename to patches/server/Make-the-default-permission-message-configurable.patch diff --git a/patches/unapplied/server/Optimize-World-Time-Updates.patch b/patches/server/Optimize-World-Time-Updates.patch similarity index 100% rename from patches/unapplied/server/Optimize-World-Time-Updates.patch rename to patches/server/Optimize-World-Time-Updates.patch diff --git a/patches/unapplied/server/Prevent-rayTrace-from-loading-chunks.patch b/patches/server/Prevent-rayTrace-from-loading-chunks.patch similarity index 94% rename from patches/unapplied/server/Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/Prevent-rayTrace-from-loading-chunks.patch index a7c058ce14..bdac6a8986 100644 --- a/patches/unapplied/server/Prevent-rayTrace-from-loading-chunks.patch +++ b/patches/server/Prevent-rayTrace-from-loading-chunks.patch @@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public interface BlockGetter extends LevelHeightAccessor { // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace - default BlockHitResult rayTraceBlock(ClipContext raytrace1, BlockPos blockposition) { + default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) { - BlockState iblockdata = this.getBlockState(blockposition); + // Paper start - Prevent raytrace from loading chunks + BlockState iblockdata = this.getTypeIfLoaded(blockposition); diff --git a/patches/unapplied/server/Restore-custom-InventoryHolder-support.patch b/patches/server/Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/unapplied/server/Restore-custom-InventoryHolder-support.patch rename to patches/server/Restore-custom-InventoryHolder-support.patch diff --git a/patches/unapplied/server/Use-Vanilla-Minecart-Speeds.patch b/patches/server/Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/unapplied/server/Use-Vanilla-Minecart-Speeds.patch rename to patches/server/Use-Vanilla-Minecart-Speeds.patch diff --git a/todo.txt b/todo.txt index d14a417b40..c8b02579e5 100644 --- a/todo.txt +++ b/todo.txt @@ -3,3 +3,4 @@ Check IBlockDataList#GLOBAL_PALETTE Check if PlayerNaturallySpawnedEvent is called correctly Make sure fluids aren't completly fucked, there may be more sync loads to nuke there as well Improve Server Thread Pool and Thread Priorities: mojang added a max thread count property +Use Vanilla Minecart Speeds: is this needed?