From 5d834b1b7136de9525dfa405cf6c466c62c3abc1 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 15 Jun 2024 06:22:06 -0700 Subject: [PATCH] rebuild patches --- ...ve-Maps-in-item-frames-performance-and-bug-fixe.patch} | 4 ++-- ...trip-raytracing-for-EntityLiving-hasLineOfSight.patch} | 0 ...ize-Network-Manager-and-add-advanced-packet-sup.patch} | 0 ....patch => 0996-Allow-Saving-of-Oversized-Chunks.patch} | 0 ...s.patch => 0997-Flat-bedrock-generator-settings.patch} | 0 ...e-2.0.patch => 0998-Entity-Activation-Range-2.0.patch} | 2 +- ...ns.patch => 0999-Optional-per-player-mob-spawns.patch} | 8 ++++---- .../server/{1001-Anti-Xray.patch => 1000-Anti-Xray.patch} | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename patches/server/{0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0993-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (97%) rename patches/server/{0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0994-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (100%) rename patches/server/{0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0995-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%) rename patches/server/{0997-Allow-Saving-of-Oversized-Chunks.patch => 0996-Allow-Saving-of-Oversized-Chunks.patch} (100%) rename patches/server/{0998-Flat-bedrock-generator-settings.patch => 0997-Flat-bedrock-generator-settings.patch} (100%) rename patches/server/{0999-Entity-Activation-Range-2.0.patch => 0998-Entity-Activation-Range-2.0.patch} (99%) rename patches/server/{1000-Optional-per-player-mob-spawns.patch => 0999-Optional-per-player-mob-spawns.patch} (98%) rename patches/server/{1001-Anti-Xray.patch => 1000-Anti-Xray.patch} (99%) diff --git a/patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0993-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 97% rename from patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0993-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 3a9a25773f..655f635c6c 100644 --- a/patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/patches/server/0993-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -13,10 +13,10 @@ custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3a32c1bfc66b291d0caf903a6de8f054ccac74db..89f595e27fae384632ac51af5b69e9f3400b52eb 100644 +index ec8eec86876221686f152bc5b25304cc59791cac..c8a5acc167310ac08720deca285872d40eed187a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2497,6 +2497,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. +@@ -2466,6 +2466,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. { if ( iter.next().player == entity ) { diff --git a/patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0994-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0994-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0995-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0995-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0996-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0996-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0998-Flat-bedrock-generator-settings.patch b/patches/server/0997-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0998-Flat-bedrock-generator-settings.patch rename to patches/server/0997-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0999-Entity-Activation-Range-2.0.patch b/patches/server/0998-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0999-Entity-Activation-Range-2.0.patch rename to patches/server/0998-Entity-Activation-Range-2.0.patch index de7abb45fb..6ac2fde9e8 100644 --- a/patches/server/0999-Entity-Activation-Range-2.0.patch +++ b/patches/server/0998-Entity-Activation-Range-2.0.patch @@ -17,7 +17,7 @@ Adds villagers as separate config public net.minecraft.world.entity.Entity isInsidePortal diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 89f595e27fae384632ac51af5b69e9f3400b52eb..b5cfd8994c201b2025597f334b3bc33ff4011409 100644 +index c8a5acc167310ac08720deca285872d40eed187a..012caff6893bba6c85989c2f5627faf44fa41ffe 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2,7 +2,6 @@ package net.minecraft.server.level; diff --git a/patches/server/1000-Optional-per-player-mob-spawns.patch b/patches/server/0999-Optional-per-player-mob-spawns.patch similarity index 98% rename from patches/server/1000-Optional-per-player-mob-spawns.patch rename to patches/server/0999-Optional-per-player-mob-spawns.patch index c906a945c5..67e29bd026 100644 --- a/patches/server/1000-Optional-per-player-mob-spawns.patch +++ b/patches/server/0999-Optional-per-player-mob-spawns.patch @@ -37,10 +37,10 @@ index b849e0cf15f894aa87b1bb397d85b887b8fb816e..7bebf252887ecc7594b1ce21471fb6ba // Paper end diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index c742667e6b6d94dde7b0e27737c1e71dc0cfcbdc..ce056e5d17694611236ce604d4d989173a87d399 100644 +index ade744dd17431cc671de1322d7f58b54039fe1c9..3e97778b94d2062a40a5e07bb3bac7cd792d7566 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -512,7 +512,19 @@ public class ServerChunkCache extends ChunkSource { +@@ -503,7 +503,19 @@ public class ServerChunkCache extends ChunkSource { gameprofilerfiller.popPush("naturalSpawnCount"); this.level.timings.countNaturalMobs.startTiming(); // Paper - timings int k = this.distanceManager.getNaturalSpawnChunkCount(); @@ -62,10 +62,10 @@ index c742667e6b6d94dde7b0e27737c1e71dc0cfcbdc..ce056e5d17694611236ce604d4d98917 this.lastSpawnState = spawnercreature_d; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 92c9304d0ea1286766243e679fea357f7e690402..62569beec171e1398d18197994092c205074c025 100644 +index 6b9354e3ac064daa3101e71d8e54e883f628f70c..c75812c195cc83dbe02eebc9ba67b2a9c29ca9a4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -276,6 +276,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -275,6 +275,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple public boolean queueHealthUpdatePacket; public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket; // Paper end - cancellable death event diff --git a/patches/server/1001-Anti-Xray.patch b/patches/server/1000-Anti-Xray.patch similarity index 99% rename from patches/server/1001-Anti-Xray.patch rename to patches/server/1000-Anti-Xray.patch index ee9b38a427..d60a304b4a 100644 --- a/patches/server/1001-Anti-Xray.patch +++ b/patches/server/1000-Anti-Xray.patch @@ -1104,7 +1104,7 @@ index 183b2191fa1c1b27adedf39593e1b5a223fb1279..8ead66c134688b11dca15f6509147e72 private ClientboundLevelChunkWithLightPacket(RegistryFriendlyByteBuf buf) { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b5cfd8994c201b2025597f334b3bc33ff4011409..3968227d413d4acf68292ce9fba7e3a8f5ee0694 100644 +index 012caff6893bba6c85989c2f5627faf44fa41ffe..bac8deab8f703c2e0ecbc11bf218319bb52e0cd4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -502,7 +502,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. @@ -1155,7 +1155,7 @@ index 32634e45ac8433648e49e47e20081e15ad41ff15..dafa2cf7d3c49fc5bdcd68d2a9528127 if (io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0) { new io.papermc.paper.event.packet.PlayerChunkLoadEvent(new org.bukkit.craftbukkit.CraftChunk(chunk), handler.getPlayer().getBukkitEntity()).callEvent(); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 883fa950284da3baf2de7a289dfcd7c0a2dfd3f9..dc4af41c0c26689dffb4bfd299a27f2ee6800cb5 100644 +index 9b1a6d8351fb473eec75a2fd08fb892b770e3586..0d0b07c9199be9ca0d5ac3feb1d44f149ba69283 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -414,7 +414,7 @@ public abstract class PlayerList {