diff --git a/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch index b73f9ab1ff..9dbdcfcde7 100644 --- a/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch +++ b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch @@ -3,6 +3,8 @@ From: Aikar Date: Sun, 18 Mar 2018 11:43:30 -0400 Subject: [PATCH] Add more fields to AsyncPreLoginEvent +Co-authored-by: Connor Linfoot +Co-authored-by: MCMDEV diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..f8b69b52ec8efa103e4e78e1b5c6a015e73d2a75 100644 diff --git a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch index 8c58e6d697..073bea1053 100644 --- a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch +++ b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch @@ -5,8 +5,25 @@ Subject: [PATCH] Add setting for proxy online mode status TODO: Add isProxyOnlineMode check to Metrics +diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +index 1ee3e38703175707dec6493a1785b1bbc5170793..73b398ffc86498151944bedb0ef12d63de35c603 100644 +--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java ++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +@@ -584,7 +584,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + public boolean enforceSecureProfile() { + DedicatedServerProperties dedicatedserverproperties = this.getProperties(); + +- return dedicatedserverproperties.enforceSecureProfile && dedicatedserverproperties.onlineMode && this.services.canValidateProfileKeys(); ++ // Paper start - Add setting for proxy online mode status ++ return dedicatedserverproperties.enforceSecureProfile ++ && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ++ && this.services.canValidateProfileKeys(); ++ // Paper end - Add setting for proxy online mode status + } + + @Override diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java -index 0a2875f63523cc5eeec603e18eb62520587a8475..09de1ca3802e97442bc090db0cc87fd833ad3a9f 100644 +index 0a2875f63523cc5eeec603e18eb62520587a8475..64f7c3180a745a62bb5d71a42668cc67b5d56c3a 100644 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java @@ -89,7 +89,8 @@ public class GameProfileCache { @@ -15,7 +32,7 @@ index 0a2875f63523cc5eeec603e18eb62520587a8475..09de1ca3802e97442bc090db0cc87fd8 - if (!org.apache.commons.lang3.StringUtils.isBlank(name)) // Paper - Don't lookup a profile with a blank name) + if (!org.apache.commons.lang3.StringUtils.isBlank(name) // Paper - Don't lookup a profile with a blank name -+ && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) // Paper - only run in online mode - 100 COL ++ && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) // Paper - Add setting for proxy online mode status repository.findProfilesByNames(new String[]{name}, profilelookupcallback); GameProfile gameprofile = (GameProfile) atomicreference.get(); @@ -24,12 +41,12 @@ index 0a2875f63523cc5eeec603e18eb62520587a8475..09de1ca3802e97442bc090db0cc87fd8 private static boolean usesAuthentication() { - return GameProfileCache.usesAuthentication; -+ return io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode(); // Paper ++ return io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode(); // Paper - Add setting for proxy online mode status } public void add(GameProfile profile) { diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java -index 78b11d6fd74fb0714a8013fdc78d096643c4f83c..6a64c58fff9bbed542bf29a029531996f2a50d00 100644 +index 78b11d6fd74fb0714a8013fdc78d096643c4f83c..14bd0b94ece3f826f822b4900c7250ebdc27d937 100644 --- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java +++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java @@ -66,7 +66,8 @@ public class OldUsersConverter { @@ -38,12 +55,12 @@ index 78b11d6fd74fb0714a8013fdc78d096643c4f83c..6a64c58fff9bbed542bf29a029531996 - if (server.usesAuthentication() || org.spigotmc.SpigotConfig.bungee) { // Spigot: bungee = online mode, for now. + if (server.usesAuthentication() || -+ (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode())) { // Spigot: bungee = online mode, for now. // Paper - Handle via setting ++ (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode())) { // Spigot: bungee = online mode, for now. // Paper - Add setting for proxy online mode status server.getProfileRepository().findProfilesByNames(astring, callback); } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f8613718893c778cac3396fcedba1cf8144f0f0e..876c82e1f1e74417978fd974bd747562b9f8ccdd 100644 +index f8613718893c778cac3396fcedba1cf8144f0f0e..6d45d5f149211eaad9a07019290dac2c3d04084c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1821,7 +1821,7 @@ public final class CraftServer implements Server { @@ -51,7 +68,7 @@ index f8613718893c778cac3396fcedba1cf8144f0f0e..876c82e1f1e74417978fd974bd747562 GameProfile profile = null; // Only fetch an online UUID in online mode - if (this.getOnlineMode() || org.spigotmc.SpigotConfig.bungee) { // Spigot: bungee = online mode, for now. -+ if (this.getOnlineMode() || io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // Paper - Handle via setting ++ if (this.getOnlineMode() || io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // Paper - Add setting for proxy online mode status // This is potentially blocking :( profile = this.console.getProfileCache().get(name).orElse(null); } diff --git a/patches/server/0365-Improved-Watchdog-Support.patch b/patches/server/0365-Improved-Watchdog-Support.patch index 243fe13fb0..1d1edf3f82 100644 --- a/patches/server/0365-Improved-Watchdog-Support.patch +++ b/patches/server/0365-Improved-Watchdog-Support.patch @@ -231,7 +231,7 @@ index ce113cc2bc52c1135799190a22e0be21744b58cc..9a25d351df1141e9218d37c0f90e2d67 this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary()); this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 36312e6ec95324c16a5e70f3cc8c66127653b965..9ddcca2c17c15c5c7d88046aeae8b5588ad4612d 100644 +index 5f4f993243f19f1e88b7f2bc5e40a6b2125fd819..c9cca6ba3500791485bf19155156c38c24f1c761 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -269,7 +269,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -253,7 +253,7 @@ index 36312e6ec95324c16a5e70f3cc8c66127653b965..9ddcca2c17c15c5c7d88046aeae8b558 } @Override -@@ -774,7 +775,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -778,7 +779,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @Override public void stopServer() { super.stopServer(); diff --git a/patches/server/0421-Remove-some-streams-from-structures.patch b/patches/server/0421-Remove-some-streams-from-structures.patch deleted file mode 100644 index 136b102df3..0000000000 --- a/patches/server/0421-Remove-some-streams-from-structures.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: JRoy -Date: Mon, 29 Jun 2020 17:03:06 -0400 -Subject: [PATCH] Remove some streams from structures - -This showed up a lot in the spark profiler, should have a low-medium performance improvement. - -diff --git a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java -index bb8d8edb47621665872a5e8fc01512ba40c1b913..5d721dc196a6bde511f46dbdedb2e1d98553ac52 100644 ---- a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java -+++ b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java -@@ -36,9 +36,10 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker { - int j = pos.getMinBlockZ(); - ObjectList objectList = new ObjectArrayList<>(10); - ObjectList objectList2 = new ObjectArrayList<>(32); -- world.startsForStructure(pos, (structure) -> { -+ // Paper start - replace for each -+ for (net.minecraft.world.level.levelgen.structure.StructureStart start : world.startsForStructure(pos, (structure) -> { - return structure.terrainAdaptation() != TerrainAdjustment.NONE; -- }).forEach((start) -> { -+ })) { // Paper end - TerrainAdjustment terrainAdjustment = start.getStructure().terrainAdaptation(); - - for(StructurePiece structurePiece : start.getPieces()) { -@@ -51,9 +52,11 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker { - } - - for(JigsawJunction jigsawJunction : poolElementStructurePiece.getJunctions()) { -- int i = jigsawJunction.getSourceX(); -- int j = jigsawJunction.getSourceZ(); -- if (i > i - 12 && j > j - 12 && i < i + 15 + 12 && j < j + 15 + 12) { -+ // Paper start - decompile fix -+ int i2 = jigsawJunction.getSourceX(); -+ int j2 = jigsawJunction.getSourceZ(); -+ if (i2 > i - 12 && j2 > j - 12 && i2 < i + 15 + 12 && j2 < j + 15 + 12) { -+ // Paper end - objectList2.add(jigsawJunction); - } - } -@@ -63,7 +66,7 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker { - } - } - -- }); -+ } // Paper - return new Beardifier(objectList.iterator(), objectList2.iterator()); - } - diff --git a/patches/server/0421-Remove-streams-from-hot-code.patch b/patches/server/0421-Remove-streams-from-hot-code.patch new file mode 100644 index 0000000000..8be147a9f9 --- /dev/null +++ b/patches/server/0421-Remove-streams-from-hot-code.patch @@ -0,0 +1,244 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: JRoy +Date: Wed, 1 Jul 2020 18:01:49 -0400 +Subject: [PATCH] Remove streams from hot code + +Co-authored-by: Bjarne Koll +Co-authored-by: Spottedleaf + +diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java +index 419eadbe31b86b7192fd7a63268d547705e7c7ce..281b5cf91135984a37ad013614c910f7d4d2fee3 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java ++++ b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java +@@ -52,7 +52,7 @@ public class GateBehavior implements BehaviorControl + if (this.hasRequiredMemories(entity)) { + this.status = Behavior.Status.RUNNING; + this.orderPolicy.apply(this.behaviors); +- this.runningPolicy.apply(this.behaviors.stream(), world, entity, time); ++ this.runningPolicy.apply(this.behaviors, world, entity, time); // Paper - Perf: Remove streams from hot code + return true; + } else { + return false; +@@ -61,11 +61,13 @@ public class GateBehavior implements BehaviorControl + + @Override + public final void tickOrStop(ServerLevel world, E entity, long time) { +- this.behaviors.stream().filter((task) -> { +- return task.getStatus() == Behavior.Status.RUNNING; +- }).forEach((task) -> { +- task.tickOrStop(world, entity, time); +- }); ++ // Paper start - Perf: Remove streams from hot code ++ for (final BehaviorControl task : this.behaviors) { ++ if (task.getStatus() == Behavior.Status.RUNNING) { ++ task.tickOrStop(world, entity, time); ++ } ++ } ++ // Paper end - Perf: Remove streams from hot code + if (this.behaviors.stream().noneMatch((task) -> { + return task.getStatus() == Behavior.Status.RUNNING; + })) { +@@ -77,12 +79,16 @@ public class GateBehavior implements BehaviorControl + @Override + public final void doStop(ServerLevel world, E entity, long time) { + this.status = Behavior.Status.STOPPED; +- this.behaviors.stream().filter((task) -> { +- return task.getStatus() == Behavior.Status.RUNNING; +- }).forEach((task) -> { +- task.doStop(world, entity, time); +- }); +- this.exitErasedMemories.forEach(entity.getBrain()::eraseMemory); ++ // Paper start - Perf: Remove streams from hot code ++ for (final BehaviorControl task : this.behaviors) { ++ if (task.getStatus() == Behavior.Status.RUNNING) { ++ task.doStop(world, entity, time); ++ } ++ } ++ for (final MemoryModuleType exitErasedMemory : this.exitErasedMemories) { ++ entity.getBrain().eraseMemory(exitErasedMemory); ++ } ++ // Paper end - Perf: Remove streams from hot code + } + + @Override +@@ -116,26 +122,30 @@ public class GateBehavior implements BehaviorControl + + public static enum RunningPolicy { + RUN_ONE { ++ // Paper start - Perf: Remove streams from hot code + @Override +- public void apply(Stream> tasks, ServerLevel world, E entity, long time) { +- tasks.filter((task) -> { +- return task.getStatus() == Behavior.Status.STOPPED; +- }).filter((task) -> { +- return task.tryStart(world, entity, time); +- }).findFirst(); ++ public void apply(ShufflingList> tasks, ServerLevel world, E entity, long time) { ++ for (final BehaviorControl task : tasks) { ++ if (task.getStatus() == Behavior.Status.STOPPED && task.tryStart(world, entity, time)) { ++ break; ++ } ++ } ++ // Paper end - Perf: Remove streams from hot code + } + }, + TRY_ALL { ++ // Paper start - Perf: Remove streams from hot code + @Override +- public void apply(Stream> tasks, ServerLevel world, E entity, long time) { +- tasks.filter((task) -> { +- return task.getStatus() == Behavior.Status.STOPPED; +- }).forEach((task) -> { +- task.tryStart(world, entity, time); +- }); ++ public void apply(ShufflingList> tasks, ServerLevel world, E entity, long time) { ++ for (final BehaviorControl task : tasks) { ++ if (task.getStatus() == Behavior.Status.STOPPED) { ++ task.tryStart(world, entity, time); ++ } ++ } ++ // Paper end - Perf: Remove streams from hot code + } + }; + +- public abstract void apply(Stream> tasks, ServerLevel world, E entity, long time); ++ public abstract void apply(ShufflingList> tasks, ServerLevel world, E entity, long time); // Paper - Perf: Remove streams from hot code + } + } +diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java +index 76dffb2705e5207db96895f82f1c7c5638f817c6..7321ca0b2ae1443b57b9389f80a237225afa45ca 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java ++++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java +@@ -61,8 +61,22 @@ public class GossipContainer { + }); + } + ++ // Paper start - Perf: Remove streams from hot code ++ private List decompress() { ++ List list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(); ++ for (Map.Entry entry : this.gossips.entrySet()) { ++ for (GossipContainer.GossipEntry cur : entry.getValue().decompress(entry.getKey())) { ++ if (cur.weightedValue() != 0) { ++ list.add(cur); ++ } ++ } ++ } ++ return list; ++ } ++ // Paper end - Perf: Remove streams from hot code ++ + private Collection selectGossipsForTransfer(RandomSource random, int count) { +- List list = this.unpack().toList(); ++ List list = this.decompress(); // Paper - Perf: Remove streams from hot code + if (list.isEmpty()) { + return Collections.emptyList(); + } else { +@@ -156,7 +170,7 @@ public class GossipContainer { + } + + public T store(DynamicOps ops) { +- return GossipContainer.GossipEntry.LIST_CODEC.encodeStart(ops, this.unpack().toList()).resultOrPartial((error) -> { ++ return GossipContainer.GossipEntry.LIST_CODEC.encodeStart(ops, this.decompress()).resultOrPartial((error) -> { // Paper - Perf: Remove streams from hot code + LOGGER.warn("Failed to serialize gossips: {}", (Object)error); + }).orElseGet(ops::emptyList); + } +@@ -184,11 +198,23 @@ public class GossipContainer { + final Object2IntMap entries = new Object2IntOpenHashMap<>(); + + public int weightedValue(Predicate gossipTypeFilter) { +- return this.entries.object2IntEntrySet().stream().filter((entry) -> { +- return gossipTypeFilter.test(entry.getKey()); +- }).mapToInt((entry) -> { +- return entry.getIntValue() * (entry.getKey()).weight; +- }).sum(); ++ // Paper start - Perf: Remove streams from hot code ++ int weight = 0; ++ for (Object2IntMap.Entry entry : entries.object2IntEntrySet()) { ++ if (gossipTypeFilter.test(entry.getKey())) { ++ weight += entry.getIntValue() * entry.getKey().weight; ++ } ++ } ++ return weight; ++ } ++ ++ public List decompress(UUID uuid) { ++ List list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(); ++ for (Object2IntMap.Entry entry : entries.object2IntEntrySet()) { ++ list.add(new GossipContainer.GossipEntry(uuid, entry.getKey(), entry.getIntValue())); ++ } ++ return list; ++ // Paper end - Perf: Remove streams from hot code + } + + public Stream unpack(UUID target) { +diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java +index a41c3365db8e9999b686f5bf4bd888458cee43a5..18e2fd705fe0db7cb9e3afe1ce7c8dcfaf93b1a5 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java ++++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java +@@ -25,14 +25,18 @@ public class NearestItemSensor extends Sensor { + protected void doTick(ServerLevel world, Mob entity) { + Brain brain = entity.getBrain(); + List list = world.getEntitiesOfClass(ItemEntity.class, entity.getBoundingBox().inflate(32.0D, 16.0D, 32.0D), (itemEntity) -> { +- return true; ++ return itemEntity.closerThan(entity, MAX_DISTANCE_TO_WANTED_ITEM) && entity.wantsToPickUp(itemEntity.getItem()); // Paper - Perf: Move predicate into getEntities + }); + list.sort(Comparator.comparingDouble(entity::distanceToSqr)); +- Optional optional = list.stream().filter((itemEntity) -> { +- return entity.wantsToPickUp(itemEntity.getItem()); +- }).filter((itemEntity) -> { +- return itemEntity.closerThan(entity, 32.0D); +- }).filter(entity::hasLineOfSight).findFirst(); +- brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, optional); ++ // Paper start - Perf: remove streams from hot code ++ ItemEntity nearest = null; ++ for (ItemEntity entityItem : list) { ++ if (entity.hasLineOfSight(entityItem)) { // Paper - Perf: Move predicate into getEntities ++ nearest = entityItem; ++ break; ++ } ++ } ++ brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, Optional.ofNullable(nearest)); ++ // Paper end - Perf: remove streams from hot code + } + } +diff --git a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java +index bb8d8edb47621665872a5e8fc01512ba40c1b913..dcb62d768d234f60af77ffb589ac2011afcfae4b 100644 +--- a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java ++++ b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java +@@ -36,9 +36,10 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker { + int j = pos.getMinBlockZ(); + ObjectList objectList = new ObjectArrayList<>(10); + ObjectList objectList2 = new ObjectArrayList<>(32); +- world.startsForStructure(pos, (structure) -> { ++ // Paper start - Perf: Remove streams from hot code ++ for (net.minecraft.world.level.levelgen.structure.StructureStart start : world.startsForStructure(pos, (structure) -> { + return structure.terrainAdaptation() != TerrainAdjustment.NONE; +- }).forEach((start) -> { ++ })) { // Paper end - Perf: Remove streams from hot code + TerrainAdjustment terrainAdjustment = start.getStructure().terrainAdaptation(); + + for(StructurePiece structurePiece : start.getPieces()) { +@@ -51,9 +52,11 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker { + } + + for(JigsawJunction jigsawJunction : poolElementStructurePiece.getJunctions()) { +- int i = jigsawJunction.getSourceX(); +- int j = jigsawJunction.getSourceZ(); +- if (i > i - 12 && j > j - 12 && i < i + 15 + 12 && j < j + 15 + 12) { ++ // Paper start - decompile fix ++ int i2 = jigsawJunction.getSourceX(); ++ int j2 = jigsawJunction.getSourceZ(); ++ if (i2 > i - 12 && j2 > j - 12 && i2 < i + 15 + 12 && j2 < j + 15 + 12) { ++ // Paper end - decompile fix + objectList2.add(jigsawJunction); + } + } +@@ -63,7 +66,7 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker { + } + } + +- }); ++ } // Paper - Perf: Remove streams from hot code + return new Beardifier(objectList.iterator(), objectList2.iterator()); + } + diff --git a/patches/server/0422-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0422-Remove-streams-from-classes-related-villager-gossip.patch deleted file mode 100644 index b9c37f3a08..0000000000 --- a/patches/server/0422-Remove-streams-from-classes-related-villager-gossip.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: JRoy -Date: Wed, 1 Jul 2020 18:01:49 -0400 -Subject: [PATCH] Remove streams from classes related villager gossip - - -diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java -index 76dffb2705e5207db96895f82f1c7c5638f817c6..097007c1c25ba55d9916fc820dd1d1149d81f6f4 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java -+++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java -@@ -61,8 +61,22 @@ public class GossipContainer { - }); - } - -+ // Paper start - Remove streams from reputation -+ private List decompress() { -+ List list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(); -+ for (Map.Entry entry : this.gossips.entrySet()) { -+ for (GossipContainer.GossipEntry cur : entry.getValue().decompress(entry.getKey())) { -+ if (cur.weightedValue() != 0) { -+ list.add(cur); -+ } -+ } -+ } -+ return list; -+ } -+ // Paper end -+ - private Collection selectGossipsForTransfer(RandomSource random, int count) { -- List list = this.unpack().toList(); -+ List list = this.decompress(); // Paper - Remove streams from reputation - if (list.isEmpty()) { - return Collections.emptyList(); - } else { -@@ -156,7 +170,7 @@ public class GossipContainer { - } - - public T store(DynamicOps ops) { -- return GossipContainer.GossipEntry.LIST_CODEC.encodeStart(ops, this.unpack().toList()).resultOrPartial((error) -> { -+ return GossipContainer.GossipEntry.LIST_CODEC.encodeStart(ops, this.decompress()).resultOrPartial((error) -> { - LOGGER.warn("Failed to serialize gossips: {}", (Object)error); - }).orElseGet(ops::emptyList); - } -@@ -184,11 +198,23 @@ public class GossipContainer { - final Object2IntMap entries = new Object2IntOpenHashMap<>(); - - public int weightedValue(Predicate gossipTypeFilter) { -- return this.entries.object2IntEntrySet().stream().filter((entry) -> { -- return gossipTypeFilter.test(entry.getKey()); -- }).mapToInt((entry) -> { -- return entry.getIntValue() * (entry.getKey()).weight; -- }).sum(); -+ // Paper start - Remove streams from reputation -+ int weight = 0; -+ for (Object2IntMap.Entry entry : entries.object2IntEntrySet()) { -+ if (gossipTypeFilter.test(entry.getKey())) { -+ weight += entry.getIntValue() * entry.getKey().weight; -+ } -+ } -+ return weight; -+ } -+ -+ public List decompress(UUID uuid) { -+ List list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>(); -+ for (Object2IntMap.Entry entry : entries.object2IntEntrySet()) { -+ list.add(new GossipContainer.GossipEntry(uuid, entry.getKey(), entry.getIntValue())); -+ } -+ return list; -+ // Paper end - } - - public Stream unpack(UUID target) { diff --git a/patches/server/0423-Support-components-in-ItemMeta.patch b/patches/server/0422-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0423-Support-components-in-ItemMeta.patch rename to patches/server/0422-Support-components-in-ItemMeta.patch diff --git a/patches/server/0424-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0423-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0424-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0423-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0425-Add-entity-liquid-API.patch b/patches/server/0424-Add-entity-liquid-API.patch similarity index 94% rename from patches/server/0425-Add-entity-liquid-API.patch rename to patches/server/0424-Add-entity-liquid-API.patch index 165c4bb55b..3d2fc104d1 100644 --- a/patches/server/0425-Add-entity-liquid-API.patch +++ b/patches/server/0424-Add-entity-liquid-API.patch @@ -8,7 +8,7 @@ public net.minecraft.world.entity.Entity isInRain()Z public net.minecraft.world.entity.Entity isInBubbleColumn()Z diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 4d71849e8330e6f758e10223fabdb5d6ed0e7221..3444051416632eb30ef2cb820767285718095497 100644 +index 3da7fbec0fb55fb590fc9ff4bd0f984a5cac9fba..c17bb16567ad2354dc80e710469730b1dbc55b08 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1023,5 +1023,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0426-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0425-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0426-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0425-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0427-Add-PrepareResultEvent.patch b/patches/server/0426-Add-PrepareResultEvent.patch similarity index 99% rename from patches/server/0427-Add-PrepareResultEvent.patch rename to patches/server/0426-Add-PrepareResultEvent.patch index 25662bdf0a..45a8d11a2c 100644 --- a/patches/server/0427-Add-PrepareResultEvent.patch +++ b/patches/server/0426-Add-PrepareResultEvent.patch @@ -94,7 +94,7 @@ index 9c2fe69ced7a46bbd8b0fbe10fa67d0a39b0f375..70ecc3f673ebd56b65ad901e10f40c28 private void setupRecipeList(Container input, ItemStack stack) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d0c267a79f262dafdd74a6c661a234b9301eddd2..31de936ece1391d75d41a00479a82f8dd0cbc850 100644 +index 90b93b7139f9a11028b0d78b109b478b8052e982..afccfcab4c1682c47bffe7e3c10a9ec60092e8a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1714,26 +1714,53 @@ public class CraftEventFactory { diff --git a/patches/server/0428-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0427-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 91% rename from patches/server/0428-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0427-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch index abea401531..038713778f 100644 --- a/patches/server/0428-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch +++ b/patches/server/0427-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4b1366a456e7132d438fc99bd62e1dd77e35b35f..90c66f87e721ef34bf3f47b601456fece3064225 100644 +index 2fa60d96da53ca954dc1421745fafaeb2e806ed0..05fe4828af59e3cd894c9979ecb08ad0e1c6b2d3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3510,7 +3510,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0429-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0428-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0429-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0428-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0430-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0429-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0430-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0429-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0431-Fix-SPIGOT-5989.patch b/patches/server/0430-Fix-SPIGOT-5989.patch similarity index 97% rename from patches/server/0431-Fix-SPIGOT-5989.patch rename to patches/server/0430-Fix-SPIGOT-5989.patch index 6b4d6c7bc1..b863fc029c 100644 --- a/patches/server/0431-Fix-SPIGOT-5989.patch +++ b/patches/server/0430-Fix-SPIGOT-5989.patch @@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is still at a respawn anchor. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index ed686f82dfd264a6b5d0a89163786574525f043e..e9c19cb33ce1ca81b81dbf9dc927289a8ab0520d 100644 +index 62888ec5766806016545e34758da20884626697a..5f24db6b68b629812d90b7b5e2f06c21732ed098 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -808,6 +808,7 @@ public abstract class PlayerList { diff --git a/patches/server/0432-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0431-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0432-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0431-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0433-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0432-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 89% rename from patches/server/0433-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0432-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch index e67a4ea7a6..de07acbef2 100644 --- a/patches/server/0433-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch +++ b/patches/server/0432-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 49553615418bcbb6f3e4be6f38a9ecd0a650502b..0cb453b03977e90addc26f71d0518f134af3c36a 100644 +index 6170ff19f44a93e99c6aece6ed456a6af912efbb..1c64c81980739bbf09b71e1d1dd6d86dbf924e0d 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -175,6 +175,7 @@ public class Main { diff --git a/patches/server/0434-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0433-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0434-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0433-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0435-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0434-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0435-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0434-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0436-Fix-some-rails-connecting-improperly.patch b/patches/server/0435-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0436-Fix-some-rails-connecting-improperly.patch rename to patches/server/0435-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0437-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0436-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0437-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0436-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0438-Brand-support.patch b/patches/server/0437-Brand-support.patch similarity index 96% rename from patches/server/0438-Brand-support.patch rename to patches/server/0437-Brand-support.patch index 6a623585c5..0aca87477d 100644 --- a/patches/server/0438-Brand-support.patch +++ b/patches/server/0437-Brand-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 14126f4f2f0c8d5ae06275fd735178a2c4d3efc0..f73988baef278bf603fc53a8a371514a094d9c37 100644 +index fddbd703071ec93d6e3a9ecc1ff17b3e74eb8986..8eb1d297ff0317ac679e85e03d0b4546fa1ed315 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -278,6 +278,7 @@ public class ServerPlayer extends Player { @@ -57,7 +57,7 @@ index 44aa178968c87fa72023a2c0f33c1a8123f3db72..f489b207cd3b62a33723f2e9ed0f4602 } catch (Exception ex) { ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 196ece23104bc67a2df4e528851c0a2df8baaf5b..ff8bef2a88f04e4a333f90de05faddd66c69be20 100644 +index 49862c0338b84924003df85883760317d1ca7aec..e4068c64363a0769df7a01fbf8b04ac17df042fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3030,6 +3030,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0439-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0438-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0439-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0438-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0440-Don-t-require-FACING-data.patch b/patches/server/0439-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0440-Don-t-require-FACING-data.patch rename to patches/server/0439-Don-t-require-FACING-data.patch diff --git a/patches/server/0441-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0440-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 93% rename from patches/server/0441-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0440-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 7b2f9eb26f..01a8c26fd0 100644 --- a/patches/server/0441-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0440-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 206aa969d1ea8831f4c30be11ab26ecd31fd433e..08c4b6e02c257cfbdaa0da6d65e531d4ed7be122 100644 +index 8a7dd236435b08e0857041641eec9edcef936503..307f2d8adae141cfb7f5fd3c08e68863ce3ed75f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2034,9 +2034,11 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -21,7 +21,7 @@ index 206aa969d1ea8831f4c30be11ab26ecd31fd433e..08c4b6e02c257cfbdaa0da6d65e531d4 // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8efc044e5a38766aa29cb62db553a8390de50139..52628759695a441ff21f3077cfe9f75a6e999456 100644 +index 36d7c41505d41443e6034dfc88ce177fe47d980f..6a6bdc23767d4b0413352eda860f3fd3076f492e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -262,12 +262,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0442-Add-moon-phase-API.patch b/patches/server/0441-Add-moon-phase-API.patch similarity index 90% rename from patches/server/0442-Add-moon-phase-API.patch rename to patches/server/0441-Add-moon-phase-API.patch index 56f71054b9..a3c7110453 100644 --- a/patches/server/0442-Add-moon-phase-API.patch +++ b/patches/server/0441-Add-moon-phase-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 954d7a92d9deaf2332ddcfbb7f53f425ada822b6..be0ca9e82b88518109eec88735e628b8de9ebe72 100644 +index 588d583201bdd850052bdd2beaf08fc9b5473689..0fb214ddd919b568da64541fd9b531c65caa5fad 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -499,4 +499,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0442-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0442-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0444-Prevent-headless-pistons-from-being-created.patch b/patches/server/0443-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0444-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0443-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0445-Add-BellRingEvent.patch b/patches/server/0444-Add-BellRingEvent.patch similarity index 93% rename from patches/server/0445-Add-BellRingEvent.patch rename to patches/server/0444-Add-BellRingEvent.patch index d307d78495..35d5f6fb9c 100644 --- a/patches/server/0445-Add-BellRingEvent.patch +++ b/patches/server/0444-Add-BellRingEvent.patch @@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a village bell. Passes along the bell block and the player who rang it. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 31de936ece1391d75d41a00479a82f8dd0cbc850..e33dbade37e4763f838b6cd1267a4f0b9c1533b9 100644 +index afccfcab4c1682c47bffe7e3c10a9ec60092e8a0..6595c82741d5d7596fae982ac44461ae9086c064 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -366,10 +366,11 @@ public class CraftEventFactory { diff --git a/patches/server/0446-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0445-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0446-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0445-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0447-Buffer-joins-to-world.patch b/patches/server/0446-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0447-Buffer-joins-to-world.patch rename to patches/server/0446-Buffer-joins-to-world.patch diff --git a/patches/server/0448-Eigencraft-redstone-implementation.patch b/patches/server/0447-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0448-Eigencraft-redstone-implementation.patch rename to patches/server/0447-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0449-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0448-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 97% rename from patches/server/0449-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0448-Fix-hex-colors-not-working-in-some-kick-messages.patch index 95c8bad34b..efe0e50025 100644 --- a/patches/server/0449-Fix-hex-colors-not-working-in-some-kick-messages.patch +++ b/patches/server/0448-Fix-hex-colors-not-working-in-some-kick-messages.patch @@ -29,7 +29,7 @@ index 21aafb1ea51769659462d722aa318460b37cbc1c..5d7f092e966d5b0496f48bd5c9d27415 this.connection.disconnect(ichatmutablecomponent); } else { diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 615fb00e50f3c434809f8e1b201d457b9beae8fd..faf1ae03a308ad07091e3e847370e9bda66288b2 100644 +index e9d94abb77693a845ea6318b7045bd61a7a46feb..e2c7fa3fd05ebb3b76388410d26b6493baf4f877 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -99,7 +99,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0450-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0449-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 97% rename from patches/server/0450-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0449-PortalCreateEvent-needs-to-know-its-entity.patch index 86c18082c5..12f0ccc200 100644 --- a/patches/server/0450-PortalCreateEvent-needs-to-know-its-entity.patch +++ b/patches/server/0449-PortalCreateEvent-needs-to-know-its-entity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index e9df7ea1228603ee3ebf515b6419f668cbe3aef7..0dfa1ca78f747b2ea7e6b9f59d4561daad8bfcc8 100644 +index c5e36e7e96902fc0e8e9bb409907c6424cf223bd..761a46c21aaddcd43b4c33f477658605648127e9 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -478,7 +478,7 @@ public final class ItemStack { @@ -79,7 +79,7 @@ index 8fce3ad36a6ee8166f4abd9e0e369b641d487af9..3fb197ee3bfd3f36881b7d67f7a37f03 private static int getFireTickDelay(RandomSource random) { diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index c64213fe3ec0bd34cd1b31ae18eff1fecbcf63d6..31dc96c371953eb7ca3d3b444b123ade1f24c909 100644 +index 79ff216e473ebc4bf7ab3ade42b0fa224f7e4c19..fb46c66d916931fd80a99c59030ca05e12d29953 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -43,6 +43,7 @@ import net.minecraft.world.item.DyeColor; diff --git a/patches/server/0451-Add-more-Evoker-API.patch b/patches/server/0450-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0451-Add-more-Evoker-API.patch rename to patches/server/0450-Add-more-Evoker-API.patch diff --git a/patches/server/0452-Add-methods-to-get-translation-keys.patch b/patches/server/0451-Add-methods-to-get-translation-keys.patch similarity index 98% rename from patches/server/0452-Add-methods-to-get-translation-keys.patch rename to patches/server/0451-Add-methods-to-get-translation-keys.patch index 7307a84d68..a4ba0afcdc 100644 --- a/patches/server/0452-Add-methods-to-get-translation-keys.patch +++ b/patches/server/0451-Add-methods-to-get-translation-keys.patch @@ -10,7 +10,7 @@ public org.bukkit.craftbukkit.inventory.CraftMetaFirework getNBT(Lorg/bukkit/Fir Co-authored-by: MeFisto94 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index d0b1a419c9bc73066d79459dc3e5998160f8038b..a7783474afef0a2bab7e99e475c6d130bb88b01c 100644 +index f041b5d80bff9c022b007e04ef1558e9116acc6b..a586442422a2b2c06b785af0d261d3e19eb1d59b 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -669,5 +669,10 @@ public class CraftBlock implements Block { diff --git a/patches/server/0453-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0452-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0453-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0452-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0454-Cache-block-data-strings.patch b/patches/server/0453-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0454-Cache-block-data-strings.patch rename to patches/server/0453-Cache-block-data-strings.patch diff --git a/patches/server/0455-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0454-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0455-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0454-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0456-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0455-Add-additional-open-container-api-to-HumanEntity.patch similarity index 97% rename from patches/server/0456-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0455-Add-additional-open-container-api-to-HumanEntity.patch index 2cac2e1af0..0c392ad75b 100644 --- a/patches/server/0456-Add-additional-open-container-api-to-HumanEntity.patch +++ b/patches/server/0455-Add-additional-open-container-api-to-HumanEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 2d0e861275a921ccb3aabcb76ae6eb31f67dd373..7406094fc58e5df4f5d553bb882c75ba6ef766a9 100644 +index dcc5947143dc39e8f629b29d3649174327783801..6d67df9ae039c7e803c3fe6207e59923bd7be218 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -461,6 +461,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0457-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0456-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0457-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0456-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0458-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0457-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 96% rename from patches/server/0458-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0457-Extend-block-drop-capture-to-capture-all-items-added.patch index 3e68ea2f2e..415fdddb48 100644 --- a/patches/server/0458-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/patches/server/0457-Extend-block-drop-capture-to-capture-all-items-added.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 08c4b6e02c257cfbdaa0da6d65e531d4ed7be122..5bd212dcf32fcf3ad5c3dafbd3d413755a8cd934 100644 +index 307f2d8adae141cfb7f5fd3c08e68863ce3ed75f..902f3a7ae5ba9c15b634bb2f214be7d85c6d5a00 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1532,6 +1532,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0459-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0458-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 94% rename from patches/server/0459-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0458-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index 35e55d554a..d1e3210ee8 100644 --- a/patches/server/0459-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/server/0458-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 452789dc47393580374bf438e6229b1e6cd3832b..e3275f09f48c9e69179fd17901d4294ddb68a435 100644 +index ec224193e9ca7734fe533d5cfc0e316d5eed2adb..03eee2a591a533ec9930a262ffd4af2023a07c91 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4493,4 +4493,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0460-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0459-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0460-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0459-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0461-Entity-isTicking.patch b/patches/server/0460-Entity-isTicking.patch similarity index 87% rename from patches/server/0461-Entity-isTicking.patch rename to patches/server/0460-Entity-isTicking.patch index b225bb8bca..5e72f3630c 100644 --- a/patches/server/0461-Entity-isTicking.patch +++ b/patches/server/0460-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e3275f09f48c9e69179fd17901d4294ddb68a435..46637e6913e5f2aae0be6aa67b95f1fe604b021e 100644 +index 03eee2a591a533ec9930a262ffd4af2023a07c91..4a1245fb3ad821ee997b35f180390a07bc871982 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4498,5 +4498,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -19,7 +19,7 @@ index e3275f09f48c9e69179fd17901d4294ddb68a435..46637e6913e5f2aae0be6aa67b95f1fe // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index fdf22cb358040738a1b7fabf1cef47a5d33af832..58b591d047e88c00ea09b33ece9f16fde98d3208 100644 +index d5e8c8ed7528cdac203a7594ccf9576db0e5f019..6e302dff4c0b48694d234091b1637ff3b7b4b098 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1058,5 +1058,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0462-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0461-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0462-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0461-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0463-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0462-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 97% rename from patches/server/0463-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0462-Fix-Concurrency-issue-in-ShufflingList.patch index 07c57efa62..064548966e 100644 --- a/patches/server/0463-Fix-Concurrency-issue-in-ShufflingList.patch +++ b/patches/server/0462-Fix-Concurrency-issue-in-ShufflingList.patch @@ -7,7 +7,7 @@ if multiple threads from worldgen sort at same time, it will crash. So make a copy of the list for sorting purposes. diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java -index 419eadbe31b86b7192fd7a63268d547705e7c7ce..b45c4f50705f80163d44d9e588f86a5770f5be38 100644 +index 1fbe732e840d2018269361f7c9e7d3e4606dbff5..225af5abb839880dd6df15af28172bdc74f7b9e5 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java @@ -17,7 +17,7 @@ public class GateBehavior implements BehaviorControl diff --git a/patches/server/0464-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0463-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0464-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0463-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0465-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0464-Fix-for-large-move-vectors-crashing-server.patch similarity index 98% rename from patches/server/0465-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0464-Fix-for-large-move-vectors-crashing-server.patch index 437b5971fb..9077c29c5f 100644 --- a/patches/server/0465-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/server/0464-Fix-for-large-move-vectors-crashing-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server Check movement distance also based on current position. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0d4e641187b305c4b56782b4c70bca39efcaa69c..5ee4d04f9770672f451b8a87b65075432203e310 100644 +index 5550f60424d827616c935e3b0036f1b4f6144e5c..27b84c1db793af21c947ab31e7732a3b371da40a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -473,9 +473,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0466-Optimise-getType-calls.patch b/patches/server/0465-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0466-Optimise-getType-calls.patch rename to patches/server/0465-Optimise-getType-calls.patch diff --git a/patches/server/0467-Villager-resetOffers.patch b/patches/server/0466-Villager-resetOffers.patch similarity index 100% rename from patches/server/0467-Villager-resetOffers.patch rename to patches/server/0466-Villager-resetOffers.patch diff --git a/patches/server/0468-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0467-Retain-block-place-order-when-capturing-blockstates.patch similarity index 93% rename from patches/server/0468-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0467-Retain-block-place-order-when-capturing-blockstates.patch index 2d7288e3c4..8ddc270c44 100644 --- a/patches/server/0468-Retain-block-place-order-when-capturing-blockstates.patch +++ b/patches/server/0467-Retain-block-place-order-when-capturing-blockstates.patch @@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling cases where a captured entry is overriden) - but for now this will do. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d89b6c99e1cf4c6171ea6f2dad1e812760707603..f9b37892ca92f0fb4943088ad6c4f1f48db287c6 100644 +index a7fca2d662e013809fef088213cf0275b596629d..3588ad0b5e8510a00b1a65c73defec39ee7fb108 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -160,7 +160,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0469-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0468-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0469-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0468-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0470-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0469-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0470-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0469-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0471-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0470-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0471-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0470-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0472-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0471-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0472-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0471-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0473-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0472-Add-getOfflinePlayerIfCached-String.patch similarity index 93% rename from patches/server/0473-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0472-Add-getOfflinePlayerIfCached-String.patch index d0ca1491c1..6f4af765a5 100644 --- a/patches/server/0473-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/server/0472-Add-getOfflinePlayerIfCached-String.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ea2ca7a37d0bdcc1ccc1627e4246a8290e32d16f..95edbf365a916687d9a6a2e7598435fa1a32baf4 100644 +index 776b3d4d165303715e70c44689bb556541cb7582..8617abb738f311e2f7141ec98799f6cc8b4c6cf5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1909,6 +1909,28 @@ public final class CraftServer implements Server { diff --git a/patches/server/0474-Add-ignore-discounts-API.patch b/patches/server/0473-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0474-Add-ignore-discounts-API.patch rename to patches/server/0473-Add-ignore-discounts-API.patch diff --git a/patches/server/0475-Toggle-for-removing-existing-dragon.patch b/patches/server/0474-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0475-Toggle-for-removing-existing-dragon.patch rename to patches/server/0474-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0476-Fix-client-lag-on-advancement-loading.patch b/patches/server/0475-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0476-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0475-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0477-Item-no-age-no-player-pickup.patch b/patches/server/0476-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0477-Item-no-age-no-player-pickup.patch rename to patches/server/0476-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0478-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0477-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 99% rename from patches/server/0478-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0477-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch index 9a80ce81b8..18c0ed99c8 100644 --- a/patches/server/0478-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch +++ b/patches/server/0477-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch @@ -3,7 +3,6 @@ From: Aikar Date: Tue, 4 Aug 2020 22:24:15 +0200 Subject: [PATCH] Optimize Pathfinder - Remove Streams / Optimized collections -1.17 Update: Please do this k thx bb I utilized the IDE to convert streams to non streams code, so shouldn't be any risk of behavior change. Only did minor optimization of the generated code set to remove unnecessary things. diff --git a/patches/server/0479-Beacon-API-custom-effect-ranges.patch b/patches/server/0478-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0479-Beacon-API-custom-effect-ranges.patch rename to patches/server/0478-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0480-Add-API-for-quit-reason.patch b/patches/server/0479-Add-API-for-quit-reason.patch similarity index 94% rename from patches/server/0480-Add-API-for-quit-reason.patch rename to patches/server/0479-Add-API-for-quit-reason.patch index 949147c91a..16cb4b1757 100644 --- a/patches/server/0480-Add-API-for-quit-reason.patch +++ b/patches/server/0479-Add-API-for-quit-reason.patch @@ -25,7 +25,7 @@ index 4df0342c38f8ff763a08a145ec94325bcd50689d..2db208427447b94cdfdb22b38b6dc669 Connection.LOGGER.debug("Failed to sent packet", throwable); if (this.getSending() == PacketFlow.CLIENTBOUND) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 478abaffd1a80949b96f1c1774c98134be92e5ac..063742400f3065ace62b64b42d952517ae00ea1f 100644 +index 8eb1d297ff0317ac679e85e03d0b4546fa1ed315..ff75234d76e4f6a939841c982a6fc3e33b36ea61 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -279,6 +279,7 @@ public class ServerPlayer extends Player { @@ -37,7 +37,7 @@ index 478abaffd1a80949b96f1c1774c98134be92e5ac..063742400f3065ace62b64b42d952517 // Paper start - replace player chunk loader private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index e58e8fe05a6e826ef8bf6f04924e2aadba738d97..c07b0fcc62e8ce05ddfe9c6c9c9dd57d85e6683b 100644 +index f489b207cd3b62a33723f2e9ed0f46020d7f4fd1..0616a8e89931680602da2dbc640906708aebd5ca 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -315,6 +315,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -49,7 +49,7 @@ index e58e8fe05a6e826ef8bf6f04924e2aadba738d97..c07b0fcc62e8ce05ddfe9c6c9c9dd57d this.connection.disconnect(ichatbasecomponent); })); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index e9c19cb33ce1ca81b81dbf9dc927289a8ab0520d..d101376e05abb72aa874c11fe820fdee469302b1 100644 +index 5f24db6b68b629812d90b7b5e2f06c21732ed098..e2669eb88b76460207f2283711b64e0d6fa8f942 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -579,7 +579,7 @@ public abstract class PlayerList { diff --git a/patches/server/0481-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0480-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0481-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0480-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0482-Expose-world-spawn-angle.patch b/patches/server/0481-Expose-world-spawn-angle.patch similarity index 91% rename from patches/server/0482-Expose-world-spawn-angle.patch rename to patches/server/0481-Expose-world-spawn-angle.patch index 80e8e1b939..cfa87b6cd4 100644 --- a/patches/server/0482-Expose-world-spawn-angle.patch +++ b/patches/server/0481-Expose-world-spawn-angle.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index d101376e05abb72aa874c11fe820fdee469302b1..3ae3d47f3b94b4626f37ffbca1d2d958931b3b71 100644 +index e2669eb88b76460207f2283711b64e0d6fa8f942..8cbcbf358b978c85ade7efdefc4e138c09f634ab 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -851,7 +851,7 @@ public abstract class PlayerList { diff --git a/patches/server/0483-Add-Destroy-Speed-API.patch b/patches/server/0482-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0483-Add-Destroy-Speed-API.patch rename to patches/server/0482-Add-Destroy-Speed-API.patch diff --git a/patches/server/0484-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0483-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 93% rename from patches/server/0484-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0483-Fix-Player-spawnParticle-x-y-z-precision-loss.patch index 28cd4073a5..8ac0f729ad 100644 --- a/patches/server/0484-Fix-Player-spawnParticle-x-y-z-precision-loss.patch +++ b/patches/server/0483-Fix-Player-spawnParticle-x-y-z-precision-loss.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ff8bef2a88f04e4a333f90de05faddd66c69be20..58731389c9b120395f4eb9e38c8e8584147fe9fd 100644 +index e4068c64363a0769df7a01fbf8b04ac17df042fc..ba30c5e17a294cee9f408fdd4e31849c0e5d28ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2593,7 +2593,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0485-Add-LivingEntity-clearActiveItem.patch b/patches/server/0484-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0485-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0484-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0486-Add-PlayerItemCooldownEvent.patch b/patches/server/0485-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0486-Add-PlayerItemCooldownEvent.patch rename to patches/server/0485-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0487-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0486-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0487-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0486-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0488-More-lightning-API.patch b/patches/server/0487-More-lightning-API.patch similarity index 93% rename from patches/server/0488-More-lightning-API.patch rename to patches/server/0487-More-lightning-API.patch index bda291858a..967871902a 100644 --- a/patches/server/0488-More-lightning-API.patch +++ b/patches/server/0487-More-lightning-API.patch @@ -8,7 +8,7 @@ public net.minecraft.world.entity.LightningBolt life public net.minecraft.world.entity.LightningBolt flashes diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java -index 849c7d1e4eabfaea491b6c9004f764307ad1b9c6..cd9bd7f06e55e970b7791e635610bb5e7491d102 100644 +index 0b2ba5c93355a5b7548d4634d964732e45477a34..6fed8075aa75e3852dc826a45ca44603c0446a56 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java @@ -66,4 +66,23 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike diff --git a/patches/server/0489-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0488-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0489-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0488-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0490-Added-missing-default-perms-for-commands.patch b/patches/server/0489-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0490-Added-missing-default-perms-for-commands.patch rename to patches/server/0489-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0491-Add-PlayerShearBlockEvent.patch b/patches/server/0490-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0491-Add-PlayerShearBlockEvent.patch rename to patches/server/0490-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0492-Limit-recipe-packets.patch b/patches/server/0491-Limit-recipe-packets.patch similarity index 96% rename from patches/server/0492-Limit-recipe-packets.patch rename to patches/server/0491-Limit-recipe-packets.patch index 8aeb998190..738970877f 100644 --- a/patches/server/0492-Limit-recipe-packets.patch +++ b/patches/server/0491-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d3b90fbdd198cdb82263a39561ee5392e32edf41..3b29de365044cf6d51903dd18b6c3ece04a5fff8 100644 +index 27b84c1db793af21c947ab31e7732a3b371da40a..3683e3b56da96e5528d63319892b5ec76075d86c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -258,6 +258,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0493-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0492-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0493-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0492-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0494-Player-Chunk-Load-Unload-Events.patch b/patches/server/0493-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0494-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0493-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0495-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0494-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0495-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0494-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0496-Expose-LivingEntity-hurt-direction.patch b/patches/server/0495-Expose-LivingEntity-hurt-direction.patch similarity index 96% rename from patches/server/0496-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0495-Expose-LivingEntity-hurt-direction.patch index 43d3dccdaf..998fc4558c 100644 --- a/patches/server/0496-Expose-LivingEntity-hurt-direction.patch +++ b/patches/server/0495-Expose-LivingEntity-hurt-direction.patch @@ -18,7 +18,7 @@ index 4bac05cb48d81dc9776d90502b6f12285b92122b..2957b3929c1e92af1b1a2636b83b757a public boolean affectsSpawning = true; // Paper end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 7406094fc58e5df4f5d553bb882c75ba6ef766a9..faaed968a3e771c1db3957e2b42acf6d87a38842 100644 +index 6d67df9ae039c7e803c3fe6207e59923bd7be218..cdbd8d7d1c23809a7345f0c3b0c7f9356be47900 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -126,6 +126,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0497-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0496-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 91% rename from patches/server/0497-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0496-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index ca858b50f0..bc839e262d 100644 --- a/patches/server/0497-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0496-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e33dbade37e4763f838b6cd1267a4f0b9c1533b9..0e0c64c9fad14ad77af784e719fe6f203479db14 100644 +index 6595c82741d5d7596fae982ac44461ae9086c064..5b047c46a4d3f0c7aca7ceb562f8e429e4f498fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -301,6 +301,10 @@ public class CraftEventFactory { diff --git a/patches/server/0498-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0497-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0498-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0497-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0499-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0498-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0499-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0498-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0500-Implement-TargetHitEvent.patch b/patches/server/0499-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0500-Implement-TargetHitEvent.patch rename to patches/server/0499-Implement-TargetHitEvent.patch diff --git a/patches/server/0501-MC-4-Fix-item-position-desync.patch b/patches/server/0500-MC-4-Fix-item-position-desync.patch similarity index 96% rename from patches/server/0501-MC-4-Fix-item-position-desync.patch rename to patches/server/0500-MC-4-Fix-item-position-desync.patch index 48a9f48a82..7d3b45708b 100644 --- a/patches/server/0501-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0500-MC-4-Fix-item-position-desync.patch @@ -28,7 +28,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..33d9131e9c75ef23cd637f5d6c39a270 public Vec3 decode(long x, long y, long z) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 28d12ffb79a29be67b6476ae7fa87b557f55839f..a0c70b204007a906076d3a1f28c84521ad4471c4 100644 +index 82eb980dd463c423b2b30a3149166a227608bb96..5436949cd928303cf80b606c747f386f0189f774 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4269,6 +4269,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0502-Additional-Block-Material-API-s.patch b/patches/server/0501-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0502-Additional-Block-Material-API-s.patch rename to patches/server/0501-Additional-Block-Material-API-s.patch diff --git a/patches/server/0503-Fix-harming-potion-dupe.patch b/patches/server/0502-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0503-Fix-harming-potion-dupe.patch rename to patches/server/0502-Fix-harming-potion-dupe.patch diff --git a/patches/server/0504-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0503-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0504-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0503-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0505-Cache-burn-durations.patch b/patches/server/0504-Cache-burn-durations.patch similarity index 100% rename from patches/server/0505-Cache-burn-durations.patch rename to patches/server/0504-Cache-burn-durations.patch diff --git a/patches/server/0506-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0505-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0506-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0505-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0507-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0506-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0507-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0506-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0508-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0507-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0508-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0507-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0509-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0508-Fix-interact-event-not-being-called-sometimes.patch similarity index 97% rename from patches/server/0509-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0508-Fix-interact-event-not-being-called-sometimes.patch index 36ce1a3322..f5e0fb2f25 100644 --- a/patches/server/0509-Fix-interact-event-not-being-called-sometimes.patch +++ b/patches/server/0508-Fix-interact-event-not-being-called-sometimes.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes Co-authored-by: Moulberry diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3b29de365044cf6d51903dd18b6c3ece04a5fff8..2c87b676290e4de8e119f3ba5fd4292af9d0654e 100644 +index 3683e3b56da96e5528d63319892b5ec76075d86c..48815e94a0eacbdd03ea8630ae4a53f1a4747520 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1765,7 +1765,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0510-Zombie-API-breaking-doors.patch b/patches/server/0509-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0510-Zombie-API-breaking-doors.patch rename to patches/server/0509-Zombie-API-breaking-doors.patch diff --git a/patches/server/0511-Fix-nerfed-slime-when-splitting.patch b/patches/server/0510-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0511-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0510-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0512-Add-EntityLoadCrossbowEvent.patch b/patches/server/0511-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0512-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0511-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0513-Added-WorldGameRuleChangeEvent.patch b/patches/server/0512-Added-WorldGameRuleChangeEvent.patch similarity index 98% rename from patches/server/0513-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0512-Added-WorldGameRuleChangeEvent.patch index 0c45472f91..02a675af5c 100644 --- a/patches/server/0513-Added-WorldGameRuleChangeEvent.patch +++ b/patches/server/0512-Added-WorldGameRuleChangeEvent.patch @@ -64,7 +64,7 @@ index 334001cb749600c973c82391e1c11f0e40bd2dfb..2a480026c3bfb06e6556fe5b11d9712c public int get() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 52628759695a441ff21f3077cfe9f75a6e999456..3fbc0ea59ac2e56e3f024104c7904614827c8e04 100644 +index 6a6bdc23767d4b0413352eda860f3fd3076f492e..b70239ff42f5c7f4754bae311385e4804891fd86 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1930,8 +1930,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0514-Added-ServerResourcesReloadedEvent.patch b/patches/server/0513-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0514-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0513-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0515-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0514-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0515-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0514-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0516-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0515-Implemented-BlockFailedDispenseEvent.patch similarity index 96% rename from patches/server/0516-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0515-Implemented-BlockFailedDispenseEvent.patch index 31283d0db6..04cf1f8abd 100644 --- a/patches/server/0516-Implemented-BlockFailedDispenseEvent.patch +++ b/patches/server/0515-Implemented-BlockFailedDispenseEvent.patch @@ -32,7 +32,7 @@ index 913ed110d8402d377152753325901eb7f3ac82d6..675644974ae6fb5380a6496a2ac3ec4d } else { ItemStack itemstack = tileentitydispenser.getItem(i); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 0e0c64c9fad14ad77af784e719fe6f203479db14..8b2fda9c6cbb0872798ce3240d9a6d32cb61b82e 100644 +index 5b047c46a4d3f0c7aca7ceb562f8e429e4f498fc..5bd9efcf3bedf71a19674251271b9b72c39df444 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -2040,4 +2040,12 @@ public class CraftEventFactory { diff --git a/patches/server/0517-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0516-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0517-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0516-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0518-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0517-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0518-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0517-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0519-Configurable-door-breaking-difficulty.patch b/patches/server/0518-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0519-Configurable-door-breaking-difficulty.patch rename to patches/server/0518-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0520-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0519-Empty-commands-shall-not-be-dispatched.patch similarity index 89% rename from patches/server/0520-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0519-Empty-commands-shall-not-be-dispatched.patch index 3eefe6463d..bf2b5b144d 100644 --- a/patches/server/0520-Empty-commands-shall-not-be-dispatched.patch +++ b/patches/server/0519-Empty-commands-shall-not-be-dispatched.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Empty commands shall not be dispatched diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index b27256d251e5db5781197319f79f89cc7638c80b..f43baa1f4dbed72bbcf130e180956cfd31998256 100644 +index 337ff2b3e8ea6f106656cf4bef029d81998e0e58..2de557a5ed91e2036a7f558cfca8b174cd534959 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -287,6 +287,7 @@ public class Commands { diff --git a/patches/server/0521-Remove-stale-POIs.patch b/patches/server/0520-Remove-stale-POIs.patch similarity index 91% rename from patches/server/0521-Remove-stale-POIs.patch rename to patches/server/0520-Remove-stale-POIs.patch index 1215d86bfc..b7bb2e5aa7 100644 --- a/patches/server/0521-Remove-stale-POIs.patch +++ b/patches/server/0520-Remove-stale-POIs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5bd212dcf32fcf3ad5c3dafbd3d413755a8cd934..9ad59776ad035b8f6069f5df1fda174002ef58d1 100644 +index 902f3a7ae5ba9c15b634bb2f214be7d85c6d5a00..efbdcaff160e1c8e666d54a9babe35ac325ec8a5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2103,6 +2103,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0522-Fix-villager-boat-exploit.patch b/patches/server/0521-Fix-villager-boat-exploit.patch similarity index 93% rename from patches/server/0522-Fix-villager-boat-exploit.patch rename to patches/server/0521-Fix-villager-boat-exploit.patch index 53da0387cc..6aca9a61ef 100644 --- a/patches/server/0522-Fix-villager-boat-exploit.patch +++ b/patches/server/0521-Fix-villager-boat-exploit.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 3ae3d47f3b94b4626f37ffbca1d2d958931b3b71..1131ee88f35c3898f0119c414c8376b0d9130169 100644 +index 8cbcbf358b978c85ade7efdefc4e138c09f634ab..8137afc62e5430666ee9e74460109f7408baeffd 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -604,6 +604,14 @@ public abstract class PlayerList { diff --git a/patches/server/0523-Add-sendOpLevel-API.patch b/patches/server/0522-Add-sendOpLevel-API.patch similarity index 96% rename from patches/server/0523-Add-sendOpLevel-API.patch rename to patches/server/0522-Add-sendOpLevel-API.patch index c9ab9f7adc..be2e48d0a3 100644 --- a/patches/server/0523-Add-sendOpLevel-API.patch +++ b/patches/server/0522-Add-sendOpLevel-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 9ed8c8d90db1ae785b7f6b7e9ae7dc1147cb8a29..1e02dbbd1fbee57da79eade5a0c9cf70e38b2f13 100644 +index 8137afc62e5430666ee9e74460109f7408baeffd..32f93ed20f5f2cec71850d7e0ce8a633fd5efc82 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1105,6 +1105,11 @@ public abstract class PlayerList { diff --git a/patches/server/0524-TODO-Registry-Modification-API.patch b/patches/server/0523-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0524-TODO-Registry-Modification-API.patch rename to patches/server/0523-TODO-Registry-Modification-API.patch diff --git a/patches/server/0525-Add-StructuresLocateEvent.patch b/patches/server/0524-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0525-Add-StructuresLocateEvent.patch rename to patches/server/0524-Add-StructuresLocateEvent.patch diff --git a/patches/server/0526-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0525-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0526-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0525-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0527-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0526-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0527-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0526-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0528-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0527-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0528-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0527-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0529-Make-schedule-command-per-world.patch b/patches/server/0528-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0529-Make-schedule-command-per-world.patch rename to patches/server/0528-Make-schedule-command-per-world.patch diff --git a/patches/server/0530-Configurable-max-leash-distance.patch b/patches/server/0529-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0530-Configurable-max-leash-distance.patch rename to patches/server/0529-Configurable-max-leash-distance.patch diff --git a/patches/server/0531-Implement-BlockPreDispenseEvent.patch b/patches/server/0530-Implement-BlockPreDispenseEvent.patch similarity index 95% rename from patches/server/0531-Implement-BlockPreDispenseEvent.patch rename to patches/server/0530-Implement-BlockPreDispenseEvent.patch index 92e4e0ee35..a840af8a0a 100644 --- a/patches/server/0531-Implement-BlockPreDispenseEvent.patch +++ b/patches/server/0530-Implement-BlockPreDispenseEvent.patch @@ -17,7 +17,7 @@ index 21c37ad365e09a296c3e7a2d0cde7a29ced09c33..52e92ffd6bf5d3d721807a0b3a8e2d30 tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack)); } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 8b2fda9c6cbb0872798ce3240d9a6d32cb61b82e..59dcf578c326354bde835b5ebe94f8425f6b53b9 100644 +index 5bd9efcf3bedf71a19674251271b9b72c39df444..3fef79f0e3b8a05b11b77802b80acc8e5c584653 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -2047,5 +2047,11 @@ public class CraftEventFactory { diff --git a/patches/server/0532-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0531-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0532-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0531-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0533-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0532-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0533-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0532-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0534-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0533-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0534-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0533-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0535-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0534-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 99% rename from patches/server/0535-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0534-Add-dropLeash-variable-to-EntityUnleashEvent.patch index def86a56f0..a8c76b8b3f 100644 --- a/patches/server/0535-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/patches/server/0534-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -122,7 +122,7 @@ index 16784fcc853e23689a854e7dc6c03ed8182a164e..4eb97572a97a8d98af37c4223f42fc63 flag1 = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 59dcf578c326354bde835b5ebe94f8425f6b53b9..158f2656864f559100b33c8a48b6a1c0f2d827fa 100644 +index 3fef79f0e3b8a05b11b77802b80acc8e5c584653..2d9d6d735a13e0e0fc1f277f48c7bdb05aa3352a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1637,8 +1637,10 @@ public class CraftEventFactory { diff --git a/patches/server/0536-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0535-Reset-shield-blocking-on-dimension-change.patch similarity index 89% rename from patches/server/0536-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0535-Reset-shield-blocking-on-dimension-change.patch index 35b8ed8dae..d95df4f1e8 100644 --- a/patches/server/0536-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0535-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 090ff649eeef45fe4c0403a171e5eddff12d2c7d..9db7bfe3782e96921e3a65ed60f4494770210d5a 100644 +index ff75234d76e4f6a939841c982a6fc3e33b36ea61..33477a639304c1491b5eea8585051e266ec93bc7 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1247,6 +1247,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0537-add-DragonEggFormEvent.patch b/patches/server/0536-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0537-add-DragonEggFormEvent.patch rename to patches/server/0536-add-DragonEggFormEvent.patch diff --git a/patches/server/0538-EntityMoveEvent.patch b/patches/server/0537-EntityMoveEvent.patch similarity index 100% rename from patches/server/0538-EntityMoveEvent.patch rename to patches/server/0537-EntityMoveEvent.patch diff --git a/patches/server/0539-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0538-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 91% rename from patches/server/0539-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0538-added-option-to-disable-pathfinding-updates-on-block.patch index c702a59411..a07a4b85aa 100644 --- a/patches/server/0539-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0538-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c5fc4d510ebdc1308759be9f6ac79dfff9c69895..7b1374c8ee66c58fe6bd25173966d62e8971e3e4 100644 +index 3396f940f5c7c4e7b77a4570c34fbe5ad2c7da01..a3288d3cd160978e8bab4ca34d1fe6dbee042e28 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1677,6 +1677,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0540-Inline-shift-direction-fields.patch b/patches/server/0539-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0540-Inline-shift-direction-fields.patch rename to patches/server/0539-Inline-shift-direction-fields.patch diff --git a/patches/server/0541-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0540-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 95% rename from patches/server/0541-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0540-Allow-adding-items-to-BlockDropItemEvent.patch index bb5ff4cea6..4aa5e9a47f 100644 --- a/patches/server/0541-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0540-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 158f2656864f559100b33c8a48b6a1c0f2d827fa..ca586aef7a22b4824f3c954d9574682f6a25ab28 100644 +index 2d9d6d735a13e0e0fc1f277f48c7bdb05aa3352a..8a7c90014beb5e044abc1fd6f8832bb3c78ffb12 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -450,13 +450,30 @@ public class CraftEventFactory { diff --git a/patches/server/0542-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0541-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0542-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0541-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0543-living-entity-allow-attribute-registration.patch b/patches/server/0542-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0543-living-entity-allow-attribute-registration.patch rename to patches/server/0542-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0544-fix-dead-slime-setSize-invincibility.patch b/patches/server/0543-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0544-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0543-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0545-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0544-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0545-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0544-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0546-Expose-Tracked-Players.patch b/patches/server/0545-Expose-Tracked-Players.patch similarity index 92% rename from patches/server/0546-Expose-Tracked-Players.patch rename to patches/server/0545-Expose-Tracked-Players.patch index bc451e12be..075b73c5c5 100644 --- a/patches/server/0546-Expose-Tracked-Players.patch +++ b/patches/server/0545-Expose-Tracked-Players.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 58b591d047e88c00ea09b33ece9f16fde98d3208..f72c20c8b427c1dee1e58f03a02a6a59e28da0e7 100644 +index 6e302dff4c0b48694d234091b1637ff3b7b4b098..a6492b6a9f66d8bcda8928fadf0a5920ff7f0dab 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1063,5 +1063,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0548-Improve-ServerGUI.patch b/patches/server/0546-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0548-Improve-ServerGUI.patch rename to patches/server/0546-Improve-ServerGUI.patch diff --git a/patches/server/0547-Remove-streams-from-SensorNearest.patch b/patches/server/0547-Remove-streams-from-SensorNearest.patch deleted file mode 100644 index a7ae5d1a98..0000000000 --- a/patches/server/0547-Remove-streams-from-SensorNearest.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Bjarne Koll -Date: Wed, 3 Mar 2021 12:48:48 +0100 -Subject: [PATCH] Remove streams from SensorNearest - -The behavioural nearby sensors are validated every tick on the entities -that registered the respective sensors and are therefore a good subject -to performance improvements. - -More specifically this commit replaces the Stream#filter usage with -ArrayList#removeIf as the removeIf method on an array list is heavily -optimized towards a single internal array re-allocation without any -further overhead on the removeIf call. - -The only negative of this change is the rather agressive diff these -patches introduce as the methods are basically being reimplemented -compared to the previous stream-based implementation. - -See: https://nipafx.dev/java-stream-performance/ - -diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java -index a41c3365db8e9999b686f5bf4bd888458cee43a5..1dfcc5cba6ffb463acf161a23fff1ca452184290 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java -+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java -@@ -28,11 +28,15 @@ public class NearestItemSensor extends Sensor { - return true; - }); - list.sort(Comparator.comparingDouble(entity::distanceToSqr)); -- Optional optional = list.stream().filter((itemEntity) -> { -- return entity.wantsToPickUp(itemEntity.getItem()); -- }).filter((itemEntity) -> { -- return itemEntity.closerThan(entity, 32.0D); -- }).filter(entity::hasLineOfSight).findFirst(); -- brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, optional); -+ // Paper start - remove streams in favour of lists -+ ItemEntity nearest = null; -+ for (ItemEntity entityItem : list) { -+ if (entity.wantsToPickUp(entityItem.getItem()) && entityItem.closerThan(entity, 32.0D) && entity.hasLineOfSight(entityItem)) { -+ nearest = entityItem; -+ break; -+ } -+ } -+ brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, Optional.ofNullable(nearest)); -+ // Paper end - } - } -diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java -index ed1b95ec694b0fe8b647964b18b8c33707fc0b47..312775d0430f793720211dc29bb293503e799d11 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java -+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java -@@ -21,18 +21,25 @@ public class PlayerSensor extends Sensor { - - @Override - protected void doTick(ServerLevel world, LivingEntity entity) { -- List list = world.players().stream().filter(EntitySelector.NO_SPECTATORS).filter((player) -> { -- return entity.closerThan(player, 16.0D); -- }).sorted(Comparator.comparingDouble(entity::distanceToSqr)).collect(Collectors.toList()); -+ List players = new java.util.ArrayList<>(world.players()); -+ players.removeIf(player -> !EntitySelector.NO_SPECTATORS.test(player) || !entity.closerThan(player, 16.0D)); -+ players.sort(Comparator.comparingDouble(entity::distanceTo)); - Brain brain = entity.getBrain(); -- brain.setMemory(MemoryModuleType.NEAREST_PLAYERS, list); -- List list2 = list.stream().filter((player) -> { -- return isEntityTargetable(entity, player); -- }).collect(Collectors.toList()); -- brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, list2.isEmpty() ? null : list2.get(0)); -- Optional optional = list2.stream().filter((player) -> { -- return isEntityAttackable(entity, player); -- }).findFirst(); -- brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, optional); -+ -+ brain.setMemory(MemoryModuleType.NEAREST_PLAYERS, players); -+ -+ Player nearest = null, nearestTargetable = null; -+ for (Player player : players) { -+ if (Sensor.isEntityTargetable(entity, player)) { -+ if (nearest == null) nearest = player; -+ if (Sensor.isEntityAttackable(entity, player)) { -+ nearestTargetable = player; -+ break; // Both variables are assigned, no reason to loop further -+ } -+ } -+ } -+ brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, nearest); -+ brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, nearestTargetable); -+ // Paper end - } - } diff --git a/patches/server/0549-fix-converting-txt-to-json-file.patch b/patches/server/0547-fix-converting-txt-to-json-file.patch similarity index 97% rename from patches/server/0549-fix-converting-txt-to-json-file.patch rename to patches/server/0547-fix-converting-txt-to-json-file.patch index 4761cc2aeb..250a6e2a28 100644 --- a/patches/server/0549-fix-converting-txt-to-json-file.patch +++ b/patches/server/0547-fix-converting-txt-to-json-file.patch @@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..935dac757280731bfeb0a8f033cbe315 this.saveUserBanList(); this.loadIpBanList(); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 4d76d64fad92510de5098613aa0a04e1bbf7bca5..d7a147cc29f9d6882326ddac29449e1b14ae9c96 100644 +index 2d5e8d624b153f55e28d8a4e008dce11853179cf..b5acccc3339e3e2b817116ecf2af228cb641b175 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -199,6 +199,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0550-Add-worldborder-events.patch b/patches/server/0548-Add-worldborder-events.patch similarity index 100% rename from patches/server/0550-Add-worldborder-events.patch rename to patches/server/0548-Add-worldborder-events.patch diff --git a/patches/server/0551-added-PlayerNameEntityEvent.patch b/patches/server/0549-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0551-added-PlayerNameEntityEvent.patch rename to patches/server/0549-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0552-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0550-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0552-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0550-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0553-Add-recipe-to-cook-events.patch b/patches/server/0551-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0553-Add-recipe-to-cook-events.patch rename to patches/server/0551-Add-recipe-to-cook-events.patch diff --git a/patches/server/0554-Add-Block-isValidTool.patch b/patches/server/0552-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0554-Add-Block-isValidTool.patch rename to patches/server/0552-Add-Block-isValidTool.patch diff --git a/patches/server/0555-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0553-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0555-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0553-Allow-using-signs-inside-spawn-protection.patch index c6d90bbf80..b1ef73a2a0 100644 --- a/patches/server/0555-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0553-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f066a3e2c21678f1019d223f97d181aa869ed9cc..4ad617dcaf1af622f405a2c6cf08ad56de85cd9d 100644 +index 48815e94a0eacbdd03ea8630ae4a53f1a4747520..06f6f39e8ac9f2ebc05d63c3c34eb2b1bdb6aa1d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1757,7 +1757,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0556-Expand-world-key-API.patch b/patches/server/0554-Expand-world-key-API.patch similarity index 95% rename from patches/server/0556-Expand-world-key-API.patch rename to patches/server/0554-Expand-world-key-API.patch index 9acc10109b..c343f5e349 100644 --- a/patches/server/0556-Expand-world-key-API.patch +++ b/patches/server/0554-Expand-world-key-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expand world key API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index be0ca9e82b88518109eec88735e628b8de9ebe72..2667822413c329fc004aad826e5890ab4dc5bfeb 100644 +index 0fb214ddd919b568da64541fd9b531c65caa5fad..9cd267f53505658d1c75187b662c4d9f68cd6bae 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -505,5 +505,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor { @@ -20,7 +20,7 @@ index be0ca9e82b88518109eec88735e628b8de9ebe72..2667822413c329fc004aad826e5890ab // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 508ccf9685058674020c04914d8107e7fb1912ce..0d0f575c07fc1cc31a3b648720558c6f8d639eb5 100644 +index 8617abb738f311e2f7141ec98799f6cc8b4c6cf5..caa58d0a531a2541cff901e6eebeca0a74f5b3dd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1137,9 +1137,15 @@ public final class CraftServer implements Server { diff --git a/patches/server/0557-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0555-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0557-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0555-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0558-Item-Rarity-API.patch b/patches/server/0556-Item-Rarity-API.patch similarity index 100% rename from patches/server/0558-Item-Rarity-API.patch rename to patches/server/0556-Item-Rarity-API.patch diff --git a/patches/server/0559-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0557-Drop-carried-item-when-player-has-disconnected.patch similarity index 92% rename from patches/server/0559-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0557-Drop-carried-item-when-player-has-disconnected.patch index b3bc183092..a7d48b393e 100644 --- a/patches/server/0559-Drop-carried-item-when-player-has-disconnected.patch +++ b/patches/server/0557-Drop-carried-item-when-player-has-disconnected.patch @@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro Closes #5036 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c8f40d71619a53f85b71ef5af397bbfa65fd797f..59d847b87d7d35598231a1352a1a1ed32f38c176 100644 +index 8a13160ff62a671a11740c456a2cbc3ccbac708f..d45b529c91e678a1f3b5b3d427eaf4019b8cc424 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -597,6 +597,14 @@ public abstract class PlayerList { diff --git a/patches/server/0560-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0558-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0560-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0558-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0561-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0559-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 91% rename from patches/server/0561-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0559-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 701440b3d4..0532301d2d 100644 --- a/patches/server/0561-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/server/0559-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4ad617dcaf1af622f405a2c6cf08ad56de85cd9d..2e41cf6f694549d9783884a2f1a9e6a54ad137c4 100644 +index 06f6f39e8ac9f2ebc05d63c3c34eb2b1bdb6aa1d..24c4a0dd076b1c4c9eac2dfece0581fc796c53a6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1190,7 +1190,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0562-Expose-protocol-version.patch b/patches/server/0560-Expose-protocol-version.patch similarity index 100% rename from patches/server/0562-Expose-protocol-version.patch rename to patches/server/0560-Expose-protocol-version.patch diff --git a/patches/server/0563-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0561-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 99% rename from patches/server/0563-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0561-Enhance-console-tab-completions-for-brigadier-comman.patch index 12c556faf5..eea0310f55 100644 --- a/patches/server/0563-Enhance-console-tab-completions-for-brigadier-comman.patch +++ b/patches/server/0561-Enhance-console-tab-completions-for-brigadier-comman.patch @@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68 + public void setErrorIndex(final int errorIndex) {} +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index d7a147cc29f9d6882326ddac29449e1b14ae9c96..5c455e4fba3e7b6064d869340667f48ed9cb3e9e 100644 +index b5acccc3339e3e2b817116ecf2af228cb641b175..d3e5235d4aa7240ba91bd40c3e1809e1fc1c4632 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0564-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0562-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 93% rename from patches/server/0564-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0562-Fix-PlayerItemConsumeEvent-cancelling-properly.patch index 2843bff0c0..dd040dff42 100644 --- a/patches/server/0564-Fix-PlayerItemConsumeEvent-cancelling-properly.patch +++ b/patches/server/0562-Fix-PlayerItemConsumeEvent-cancelling-properly.patch @@ -9,7 +9,7 @@ till their item is switched. This patch clears the active item when the event is cancelled diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e112880d8389c059a5daa572cb7906d767279084..d6b80be711b11758ef0bb3187dbcb6e597ef35d3 100644 +index 51916ff6f45090cf5e2da6b12640c130533fc4d9..383c39ac381f9a86693abb7935b5b142b889d7be 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3859,6 +3859,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0565-Add-bypass-host-check.patch b/patches/server/0563-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0565-Add-bypass-host-check.patch rename to patches/server/0563-Add-bypass-host-check.patch diff --git a/patches/server/0566-Set-area-affect-cloud-rotation.patch b/patches/server/0564-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0566-Set-area-affect-cloud-rotation.patch rename to patches/server/0564-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0567-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0565-add-isDeeplySleeping-to-HumanEntity.patch similarity index 90% rename from patches/server/0567-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0565-add-isDeeplySleeping-to-HumanEntity.patch index c1c7283532..e632b7d55c 100644 --- a/patches/server/0567-add-isDeeplySleeping-to-HumanEntity.patch +++ b/patches/server/0565-add-isDeeplySleeping-to-HumanEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index faaed968a3e771c1db3957e2b42acf6d87a38842..a5ca7c33565a3ffbb6ff991f5be2e1d807b4b4bf 100644 +index cdbd8d7d1c23809a7345f0c3b0c7f9356be47900..fd8d8b1e3583fe61b966f3550bd8e846b536b4e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -133,6 +133,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0568-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0566-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0568-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0566-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0569-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0567-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0569-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0567-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0570-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0568-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0570-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0568-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0571-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0569-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 93% rename from patches/server/0571-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0569-fix-PlayerItemHeldEvent-firing-twice.patch index c4aac740ba..0d12c6ad47 100644 --- a/patches/server/0571-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0569-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2e41cf6f694549d9783884a2f1a9e6a54ad137c4..87e118594209d3f483588f5f59013da635f59a24 100644 +index 24c4a0dd076b1c4c9eac2dfece0581fc796c53a6..91e1a5fb981dd8468bb13098424b54da1c90a998 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1926,6 +1926,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0572-Added-PlayerDeepSleepEvent.patch b/patches/server/0570-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0572-Added-PlayerDeepSleepEvent.patch rename to patches/server/0570-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0573-More-World-API.patch b/patches/server/0571-More-World-API.patch similarity index 100% rename from patches/server/0573-More-World-API.patch rename to patches/server/0571-More-World-API.patch diff --git a/patches/server/0574-Added-PlayerBedFailEnterEvent.patch b/patches/server/0572-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0574-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0572-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0575-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0573-Implement-methods-to-convert-between-Component-and-B.patch similarity index 96% rename from patches/server/0575-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0573-Implement-methods-to-convert-between-Component-and-B.patch index 573adc1950..6acb1ecfa0 100644 --- a/patches/server/0575-Implement-methods-to-convert-between-Component-and-B.patch +++ b/patches/server/0573-Implement-methods-to-convert-between-Component-and-B.patch @@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 5c455e4fba3e7b6064d869340667f48ed9cb3e9e..f9e39f557f04269769b869ff24127a6f312ddec3 100644 +index d3e5235d4aa7240ba91bd40c3e1809e1fc1c4632..019dd5a66b883e6ac8d0f07abc2636768a373664 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -210,6 +210,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0576-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0574-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 95% rename from patches/server/0576-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0574-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch index a79fb53695..f58290b66d 100644 --- a/patches/server/0576-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch +++ b/patches/server/0574-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 59d847b87d7d35598231a1352a1a1ed32f38c176..c2951a771456fc803dee0691cbe40f56a3010c70 100644 +index d45b529c91e678a1f3b5b3d427eaf4019b8cc424..43e8cb83ec6cd18706dcba7022dd0f56cf24f33b 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -824,6 +824,7 @@ public abstract class PlayerList { diff --git a/patches/server/0577-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0575-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0577-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0575-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0578-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0576-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 97% rename from patches/server/0578-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0576-add-RespawnFlags-to-PlayerRespawnEvent.patch index aa911dc229..96e8ecd7a3 100644 --- a/patches/server/0578-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/server/0576-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c9a2119728e2a1340fda2071ac54afad93431aaf..60945de12bf3b7068da9897d3af778f4f8577134 100644 +index 91e1a5fb981dd8468bb13098424b54da1c90a998..206c0a1e783699ed272e3640a29fe349eb0b465e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2644,7 +2644,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0579-Add-Channel-initialization-listeners.patch b/patches/server/0577-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0579-Add-Channel-initialization-listeners.patch rename to patches/server/0577-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0580-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0578-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 91% rename from patches/server/0580-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0578-Send-empty-commands-if-tab-completion-is-disabled.patch index a092e4c367..5ac1f00009 100644 --- a/patches/server/0580-Send-empty-commands-if-tab-completion-is-disabled.patch +++ b/patches/server/0578-Send-empty-commands-if-tab-completion-is-disabled.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Send empty commands if tab completion is disabled diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index f43baa1f4dbed72bbcf130e180956cfd31998256..1409801946be84e3256748c68ba0c62d42b869de 100644 +index 2de557a5ed91e2036a7f558cfca8b174cd534959..3b3fa067ee5a95d52645147c2d9d1e43d7a789b6 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -456,7 +456,12 @@ public class Commands { diff --git a/patches/server/0581-Add-more-WanderingTrader-API.patch b/patches/server/0579-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0581-Add-more-WanderingTrader-API.patch rename to patches/server/0579-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0582-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0580-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0582-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0580-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0583-Entity-load-save-limit-per-chunk.patch b/patches/server/0581-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0583-Entity-load-save-limit-per-chunk.patch rename to patches/server/0581-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0584-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0582-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0584-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0582-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0585-Inventory-close.patch b/patches/server/0583-Inventory-close.patch similarity index 100% rename from patches/server/0585-Inventory-close.patch rename to patches/server/0583-Inventory-close.patch diff --git a/patches/server/0586-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0584-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0586-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0584-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0587-Add-basic-Datapack-API.patch b/patches/server/0585-Add-basic-Datapack-API.patch similarity index 98% rename from patches/server/0587-Add-basic-Datapack-API.patch rename to patches/server/0585-Add-basic-Datapack-API.patch index 6b29653667..068de223c9 100644 --- a/patches/server/0587-Add-basic-Datapack-API.patch +++ b/patches/server/0585-Add-basic-Datapack-API.patch @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 346a4d7204e872f9a0e081b2afd4276b33d2cf20..1a4168073251e105c53dae2da040367294eb3787 100644 +index caa58d0a531a2541cff901e6eebeca0a74f5b3dd..565beb65968b3f7e187f3e5b59aa08e9ac34f2a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -301,6 +301,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0588-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0586-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0588-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0586-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0589-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0587-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0589-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0587-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0590-ItemStack-repair-check-API.patch b/patches/server/0588-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0590-ItemStack-repair-check-API.patch rename to patches/server/0588-ItemStack-repair-check-API.patch diff --git a/patches/server/0591-More-Enchantment-API.patch b/patches/server/0589-More-Enchantment-API.patch similarity index 100% rename from patches/server/0591-More-Enchantment-API.patch rename to patches/server/0589-More-Enchantment-API.patch diff --git a/patches/server/0592-Move-range-check-for-block-placing-up.patch b/patches/server/0590-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0592-Move-range-check-for-block-placing-up.patch rename to patches/server/0590-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0593-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0591-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0593-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0591-Fix-and-optimise-world-force-upgrading.patch index 948e820991..d04c0155d2 100644 --- a/patches/server/0593-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0591-Fix-and-optimise-world-force-upgrading.patch @@ -352,7 +352,7 @@ index deed4d50e0e4d810647a0745ef328c20dfe51093..9fa07295bf73317a4c2bbbbaf1918393 return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ())); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1a4168073251e105c53dae2da040367294eb3787..b3225546c6c65dc18aa71930a38a72c7b6997ad5 100644 +index 565beb65968b3f7e187f3e5b59aa08e9ac34f2a0..9c82a367ceacb1d2ae1a0503f5920d5919289502 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1251,9 +1251,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0594-Add-Mob-lookAt-API.patch b/patches/server/0592-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0594-Add-Mob-lookAt-API.patch rename to patches/server/0592-Add-Mob-lookAt-API.patch diff --git a/patches/server/0595-Add-Unix-domain-socket-support.patch b/patches/server/0593-Add-Unix-domain-socket-support.patch similarity index 98% rename from patches/server/0595-Add-Unix-domain-socket-support.patch rename to patches/server/0593-Add-Unix-domain-socket-support.patch index 82f599b1b2..c7280bd497 100644 --- a/patches/server/0595-Add-Unix-domain-socket-support.patch +++ b/patches/server/0593-Add-Unix-domain-socket-support.patch @@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm Reviewed-by: Mariell Hoversholm diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index f9e39f557f04269769b869ff24127a6f312ddec3..a8621519c2fec415c8d56c3510b0780b6ccd9eeb 100644 +index 019dd5a66b883e6ac8d0f07abc2636768a373664..f0d6e6f85dc2a9ae8d70dd691b144fac0298bf33 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0596-Add-EntityInsideBlockEvent.patch b/patches/server/0594-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0596-Add-EntityInsideBlockEvent.patch rename to patches/server/0594-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0597-Attributes-API-for-item-defaults.patch b/patches/server/0595-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0597-Attributes-API-for-item-defaults.patch rename to patches/server/0595-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0598-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0596-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0598-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0596-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0599-More-Lidded-Block-API.patch b/patches/server/0597-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0599-More-Lidded-Block-API.patch rename to patches/server/0597-More-Lidded-Block-API.patch diff --git a/patches/server/0600-Limit-item-frame-cursors-on-maps.patch b/patches/server/0598-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0600-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0598-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0601-Add-PlayerKickEvent-causes.patch b/patches/server/0599-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0601-Add-PlayerKickEvent-causes.patch rename to patches/server/0599-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0602-Add-PufferFishStateChangeEvent.patch b/patches/server/0600-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0602-Add-PufferFishStateChangeEvent.patch rename to patches/server/0600-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0603-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0601-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0603-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0601-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0604-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0602-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0604-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0602-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0605-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0603-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0605-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0603-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0606-Add-BellRevealRaiderEvent.patch b/patches/server/0604-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0606-Add-BellRevealRaiderEvent.patch rename to patches/server/0604-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0607-Fix-invulnerable-end-crystals.patch b/patches/server/0605-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0607-Fix-invulnerable-end-crystals.patch rename to patches/server/0605-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0608-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0606-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0608-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0606-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0609-Fix-dangerous-end-portal-logic.patch b/patches/server/0607-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0609-Fix-dangerous-end-portal-logic.patch rename to patches/server/0607-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0610-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0608-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0610-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0608-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0611-Make-item-validations-configurable.patch b/patches/server/0609-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0611-Make-item-validations-configurable.patch rename to patches/server/0609-Make-item-validations-configurable.patch diff --git a/patches/server/0612-Line-Of-Sight-Changes.patch b/patches/server/0610-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0612-Line-Of-Sight-Changes.patch rename to patches/server/0610-Line-Of-Sight-Changes.patch diff --git a/patches/server/0613-add-per-world-spawn-limits.patch b/patches/server/0611-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0613-add-per-world-spawn-limits.patch rename to patches/server/0611-add-per-world-spawn-limits.patch diff --git a/patches/server/0614-Fix-potions-splash-events.patch b/patches/server/0612-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0614-Fix-potions-splash-events.patch rename to patches/server/0612-Fix-potions-splash-events.patch diff --git a/patches/server/0615-Add-more-LimitedRegion-API.patch b/patches/server/0613-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0615-Add-more-LimitedRegion-API.patch rename to patches/server/0613-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0616-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0614-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0616-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0614-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0617-Missing-Entity-API.patch b/patches/server/0615-Missing-Entity-API.patch similarity index 100% rename from patches/server/0617-Missing-Entity-API.patch rename to patches/server/0615-Missing-Entity-API.patch diff --git a/patches/server/0618-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0616-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0618-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0616-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0619-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0617-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0619-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0617-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0620-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0618-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0620-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0618-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0621-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0619-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0621-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0619-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0622-Adds-PlayerArmSwingEvent.patch b/patches/server/0620-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0622-Adds-PlayerArmSwingEvent.patch rename to patches/server/0620-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0623-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0621-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0623-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0621-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0624-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0622-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0624-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0622-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0625-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0623-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0625-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0623-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0626-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0624-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0626-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0624-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0627-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0625-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0627-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0625-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0628-Stinger-API.patch b/patches/server/0626-Stinger-API.patch similarity index 100% rename from patches/server/0628-Stinger-API.patch rename to patches/server/0626-Stinger-API.patch diff --git a/patches/server/0629-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0627-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0629-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0627-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0630-Add-System.out-err-catcher.patch b/patches/server/0628-Add-System.out-err-catcher.patch similarity index 98% rename from patches/server/0630-Add-System.out-err-catcher.patch rename to patches/server/0628-Add-System.out-err-catcher.patch index 1398271867..0bcf18a567 100644 --- a/patches/server/0630-Add-System.out-err-catcher.patch +++ b/patches/server/0628-Add-System.out-err-catcher.patch @@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b3225546c6c65dc18aa71930a38a72c7b6997ad5..7621b77d49330e462c4857f2033d74723eee4281 100644 +index 9c82a367ceacb1d2ae1a0503f5920d5919289502..7df30c0d3f647b74dd812fc9d286feb95b52dfae 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -303,6 +303,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0631-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0629-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0631-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0629-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0632-Improve-boat-collision-performance.patch b/patches/server/0630-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0632-Improve-boat-collision-performance.patch rename to patches/server/0630-Improve-boat-collision-performance.patch diff --git a/patches/server/0633-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0631-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0633-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0631-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0634-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0632-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0634-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0632-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0635-Add-PlayerSetSpawnEvent.patch b/patches/server/0633-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0635-Add-PlayerSetSpawnEvent.patch rename to patches/server/0633-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0636-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0634-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0636-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0634-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0637-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0635-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0637-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0635-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0638-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0636-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0638-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0636-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0639-Added-EntityDamageItemEvent.patch b/patches/server/0637-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0639-Added-EntityDamageItemEvent.patch rename to patches/server/0637-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0640-Optimize-indirect-passenger-iteration.patch b/patches/server/0638-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0640-Optimize-indirect-passenger-iteration.patch rename to patches/server/0638-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0641-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0639-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0641-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0639-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0642-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0640-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0642-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0640-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0643-Clear-bucket-NBT-after-dispense.patch b/patches/server/0641-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0643-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0641-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0644-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0642-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0644-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0642-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0645-Add-BlockBreakBlockEvent.patch b/patches/server/0643-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0645-Add-BlockBreakBlockEvent.patch rename to patches/server/0643-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0646-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0644-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0646-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0644-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0647-More-CommandBlock-API.patch b/patches/server/0645-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0647-More-CommandBlock-API.patch rename to patches/server/0645-More-CommandBlock-API.patch diff --git a/patches/server/0648-Add-missing-team-sidebar-display-slots.patch b/patches/server/0646-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0648-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0646-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0649-Add-back-EntityPortalExitEvent.patch b/patches/server/0647-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0649-Add-back-EntityPortalExitEvent.patch rename to patches/server/0647-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0650-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0648-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0650-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0648-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0651-Get-entity-default-attributes.patch b/patches/server/0649-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0651-Get-entity-default-attributes.patch rename to patches/server/0649-Get-entity-default-attributes.patch diff --git a/patches/server/0652-Left-handed-API.patch b/patches/server/0650-Left-handed-API.patch similarity index 100% rename from patches/server/0652-Left-handed-API.patch rename to patches/server/0650-Left-handed-API.patch diff --git a/patches/server/0653-Add-more-advancement-API.patch b/patches/server/0651-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0653-Add-more-advancement-API.patch rename to patches/server/0651-Add-more-advancement-API.patch diff --git a/patches/server/0654-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0652-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0654-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0652-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0655-Add-critical-damage-API.patch b/patches/server/0653-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0655-Add-critical-damage-API.patch rename to patches/server/0653-Add-critical-damage-API.patch diff --git a/patches/server/0656-Fix-issues-with-mob-conversion.patch b/patches/server/0654-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0656-Fix-issues-with-mob-conversion.patch rename to patches/server/0654-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0657-Add-isCollidable-methods-to-various-places.patch b/patches/server/0655-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0657-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0655-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0658-Goat-ram-API.patch b/patches/server/0656-Goat-ram-API.patch similarity index 100% rename from patches/server/0658-Goat-ram-API.patch rename to patches/server/0656-Goat-ram-API.patch diff --git a/patches/server/0659-Add-API-for-resetting-a-single-score.patch b/patches/server/0657-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0659-Add-API-for-resetting-a-single-score.patch rename to patches/server/0657-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0660-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0658-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0660-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0658-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0661-Vanilla-command-permission-fixes.patch b/patches/server/0659-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0661-Vanilla-command-permission-fixes.patch rename to patches/server/0659-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0662-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0660-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0662-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0660-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0663-Fix-GameProfileCache-concurrency.patch b/patches/server/0661-Fix-GameProfileCache-concurrency.patch similarity index 98% rename from patches/server/0663-Fix-GameProfileCache-concurrency.patch rename to patches/server/0661-Fix-GameProfileCache-concurrency.patch index f02aafe433..68ec851967 100644 --- a/patches/server/0663-Fix-GameProfileCache-concurrency.patch +++ b/patches/server/0661-Fix-GameProfileCache-concurrency.patch @@ -7,7 +7,7 @@ Separate lookup and state access locks prevent lookups from stalling simple state access/write calls diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java -index 731a7c0363c8c91d25b35f7cbbb480879381bc8d..452fbb0aa44157225d8a9064e3eae2db7771b27d 100644 +index 85172de608f04abca1be4591749564ccc0e8d600..85df8ebb1e0030e98a2b03688451cf391593651e 100644 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java @@ -60,6 +60,11 @@ public class GameProfileCache { diff --git a/patches/server/0664-Improve-and-expand-AsyncCatcher.patch b/patches/server/0662-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0664-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0662-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0665-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0663-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 99% rename from patches/server/0665-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0663-Add-paper-mobcaps-and-paper-playermobcaps.patch index 9fcd87b772..435570bcbe 100644 --- a/patches/server/0665-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0663-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -278,7 +278,7 @@ index 9df761f5cf043e8d2dffa711c20ab32fe2992331..d08c7b0b52065980f1f13c5533ff6355 // Paper start - add parameters and int ret type spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7621b77d49330e462c4857f2033d74723eee4281..e7e29ee51247fd7d5749d72d34a39d210e0c83ff 100644 +index 7df30c0d3f647b74dd812fc9d286feb95b52dfae..8f61efe32500ebe47e13d96fd96df646adb3dd5b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2279,6 +2279,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0666-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0664-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0666-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0664-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0667-Optimise-general-POI-access.patch b/patches/server/0665-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0667-Optimise-general-POI-access.patch rename to patches/server/0665-Optimise-general-POI-access.patch diff --git a/patches/server/0668-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0666-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0668-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0666-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0669-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0667-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0669-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0667-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0670-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0668-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0670-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0668-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0671-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0669-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0671-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0669-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0672-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0670-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0672-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0670-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0673-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0671-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0673-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0671-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0674-Time-scoreboard-search.patch b/patches/server/0672-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0674-Time-scoreboard-search.patch rename to patches/server/0672-Time-scoreboard-search.patch diff --git a/patches/server/0675-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0673-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0675-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0673-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0676-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0674-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0676-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0674-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0677-Execute-chunk-tasks-mid-tick.patch b/patches/server/0675-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0677-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0675-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0678-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0676-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0678-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0676-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0679-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0677-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0679-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0677-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0680-Optimise-random-block-ticking.patch b/patches/server/0678-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0680-Optimise-random-block-ticking.patch rename to patches/server/0678-Optimise-random-block-ticking.patch diff --git a/patches/server/0681-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0679-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0681-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0679-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0682-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0680-Use-Velocity-compression-and-cipher-natives.patch similarity index 99% rename from patches/server/0682-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0680-Use-Velocity-compression-and-cipher-natives.patch index 159866c83f..c37c0306aa 100644 --- a/patches/server/0682-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/0680-Use-Velocity-compression-and-cipher-natives.patch @@ -337,7 +337,7 @@ index 5f625acf04ddb56e3596d086252f9bfccfdb95f2..54c7f34ba3dc8466223e589702d0c93a protected void initChannel(Channel channel) { Connection.setInitialProtocolAttributes(channel); diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 0bed0d7aff06a400fa28348f8658d7ad385e8749..453ed111a6640bfafe66d914db976243e94f94c8 100644 +index e2c7fa3fd05ebb3b76388410d26b6493baf4f877..7a2f78ae76354e15afa5368c8fb2a571c15dc82d 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -223,12 +223,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0683-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0681-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0683-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0681-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0684-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0682-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0684-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0682-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0685-Distance-manager-tick-timings.patch b/patches/server/0683-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0685-Distance-manager-tick-timings.patch rename to patches/server/0683-Distance-manager-tick-timings.patch diff --git a/patches/server/0686-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0684-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0686-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0684-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0687-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0685-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0687-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0685-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0688-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0686-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0688-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0686-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0689-Add-packet-limiter-config.patch b/patches/server/0687-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0689-Add-packet-limiter-config.patch rename to patches/server/0687-Add-packet-limiter-config.patch diff --git a/patches/server/0690-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0688-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0690-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0688-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0691-Ensure-valid-vehicle-status.patch b/patches/server/0689-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0691-Ensure-valid-vehicle-status.patch rename to patches/server/0689-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0692-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0690-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0692-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0690-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0693-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0691-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0693-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0691-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0694-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0692-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0694-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0692-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0695-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0693-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0695-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0693-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0696-Preserve-overstacked-loot.patch b/patches/server/0694-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0696-Preserve-overstacked-loot.patch rename to patches/server/0694-Preserve-overstacked-loot.patch diff --git a/patches/server/0697-Update-head-rotation-in-missing-places.patch b/patches/server/0695-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0697-Update-head-rotation-in-missing-places.patch rename to patches/server/0695-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0698-prevent-unintended-light-block-manipulation.patch b/patches/server/0696-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0698-prevent-unintended-light-block-manipulation.patch rename to patches/server/0696-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0699-Fix-CraftCriteria-defaults-map.patch b/patches/server/0697-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0699-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0697-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0700-Fix-upstreams-block-state-factories.patch b/patches/server/0698-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0700-Fix-upstreams-block-state-factories.patch rename to patches/server/0698-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0701-Configurable-feature-seeds.patch b/patches/server/0699-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0701-Configurable-feature-seeds.patch rename to patches/server/0699-Configurable-feature-seeds.patch diff --git a/patches/server/0702-Add-root-admin-user-detection.patch b/patches/server/0700-Add-root-admin-user-detection.patch similarity index 97% rename from patches/server/0702-Add-root-admin-user-detection.patch rename to patches/server/0700-Add-root-admin-user-detection.patch index a8a91bed0f..bdd773fb1a 100644 --- a/patches/server/0702-Add-root-admin-user-detection.patch +++ b/patches/server/0700-Add-root-admin-user-detection.patch @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6 + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index a8621519c2fec415c8d56c3510b0780b6ccd9eeb..c9af6ba082d1d387aa2e6ecf5fb4647d994447f4 100644 +index f0d6e6f85dc2a9ae8d70dd691b144fac0298bf33..e69a0121c8644d831cbb8bc1c95d9219d1c343da 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0703-Always-allow-item-changing-in-Fireball.patch b/patches/server/0701-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0703-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0701-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0704-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0702-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0704-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0702-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0705-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0703-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0705-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0703-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0706-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0704-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0706-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0704-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0707-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0705-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0707-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0705-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0708-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0706-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0708-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0706-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0709-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0707-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0709-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0707-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0710-Fix-Spigot-growth-modifiers.patch b/patches/server/0708-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0710-Fix-Spigot-growth-modifiers.patch rename to patches/server/0708-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0711-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0709-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0711-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0709-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0712-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0710-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0712-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0710-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0713-Optimize-HashMapPalette.patch b/patches/server/0711-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0713-Optimize-HashMapPalette.patch rename to patches/server/0711-Optimize-HashMapPalette.patch diff --git a/patches/server/0714-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0712-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 98% rename from patches/server/0714-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0712-Allow-delegation-to-vanilla-chunk-gen.patch index 001dcd4eed..d83e71ed44 100644 --- a/patches/server/0714-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0712-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e7e29ee51247fd7d5749d72d34a39d210e0c83ff..ea5147262daade44265af7aa029d02f8314673ee 100644 +index 8f61efe32500ebe47e13d96fd96df646adb3dd5b..36a620d44140edac72e20b83a2cee2860e09deec 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2459,6 +2459,88 @@ public final class CraftServer implements Server { diff --git a/patches/server/0715-Collision-optimisations.patch b/patches/server/0713-Collision-optimisations.patch similarity index 100% rename from patches/server/0715-Collision-optimisations.patch rename to patches/server/0713-Collision-optimisations.patch diff --git a/patches/server/0716-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0714-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0716-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0714-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0717-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0715-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0717-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0715-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0718-Add-more-Campfire-API.patch b/patches/server/0716-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0718-Add-more-Campfire-API.patch rename to patches/server/0716-Add-more-Campfire-API.patch diff --git a/patches/server/0719-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0717-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0719-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0717-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0720-Fix-tripwire-state-inconsistency.patch b/patches/server/0718-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0720-Fix-tripwire-state-inconsistency.patch rename to patches/server/0718-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0721-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0719-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0721-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0719-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0722-Improve-scoreboard-entries.patch b/patches/server/0720-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0722-Improve-scoreboard-entries.patch rename to patches/server/0720-Improve-scoreboard-entries.patch diff --git a/patches/server/0723-Entity-powdered-snow-API.patch b/patches/server/0721-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0723-Entity-powdered-snow-API.patch rename to patches/server/0721-Entity-powdered-snow-API.patch diff --git a/patches/server/0724-Add-API-for-item-entity-health.patch b/patches/server/0722-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0724-Add-API-for-item-entity-health.patch rename to patches/server/0722-Add-API-for-item-entity-health.patch diff --git a/patches/server/0725-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0723-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0725-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0723-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0726-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0724-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0726-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0724-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0727-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0725-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0727-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0725-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0728-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0726-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0728-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0726-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0729-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0727-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0729-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0727-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0730-Fix-bees-aging-inside-hives.patch b/patches/server/0728-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0730-Fix-bees-aging-inside-hives.patch rename to patches/server/0728-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0731-Bucketable-API.patch b/patches/server/0729-Bucketable-API.patch similarity index 100% rename from patches/server/0731-Bucketable-API.patch rename to patches/server/0729-Bucketable-API.patch diff --git a/patches/server/0732-Validate-usernames.patch b/patches/server/0730-Validate-usernames.patch similarity index 97% rename from patches/server/0732-Validate-usernames.patch rename to patches/server/0730-Validate-usernames.patch index e86a22d0f0..a3126a1fa5 100644 --- a/patches/server/0732-Validate-usernames.patch +++ b/patches/server/0730-Validate-usernames.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 453ed111a6640bfafe66d914db976243e94f94c8..08a65700909dd64e6e15fac5c6542b02a864782b 100644 +index 7a2f78ae76354e15afa5368c8fb2a571c15dc82d..6121a3879eeb1d13653e93da02ecdbbcb2a866ac 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -63,6 +63,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, diff --git a/patches/server/0733-Make-water-animal-spawn-height-configurable.patch b/patches/server/0731-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0733-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0731-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0734-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0732-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 98% rename from patches/server/0734-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0732-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index c80646e846..eba8718684 100644 --- a/patches/server/0734-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0732-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -18,7 +18,7 @@ index 6873036e7d24a2b8e85ab7ae270eec63bd7e7b5b..ac4d96345c985284a1306055b164a74a biomeProvider = gen.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ea5147262daade44265af7aa029d02f8314673ee..c5aa5bd2a9372d9d21ac600fdf4041d78186c002 100644 +index 36a620d44140edac72e20b83a2cee2860e09deec..e2308ca7bd457ada1e5c0535d10e97affef65612 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1258,7 +1258,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0735-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0733-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0735-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0733-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0736-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0734-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch similarity index 100% rename from patches/server/0736-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch rename to patches/server/0734-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch diff --git a/patches/server/0737-Multiple-Entries-with-Scoreboards.patch b/patches/server/0735-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0737-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0735-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0738-Reset-placed-block-on-exception.patch b/patches/server/0736-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0738-Reset-placed-block-on-exception.patch rename to patches/server/0736-Reset-placed-block-on-exception.patch diff --git a/patches/server/0739-Add-configurable-height-for-slime-spawn.patch b/patches/server/0737-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0739-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0737-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0740-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0738-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0740-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0738-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0741-Multi-Block-Change-API-Implementation.patch b/patches/server/0739-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0741-Multi-Block-Change-API-Implementation.patch rename to patches/server/0739-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0742-Fix-NotePlayEvent.patch b/patches/server/0740-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0742-Fix-NotePlayEvent.patch rename to patches/server/0740-Fix-NotePlayEvent.patch diff --git a/patches/server/0743-Freeze-Tick-Lock-API.patch b/patches/server/0741-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0743-Freeze-Tick-Lock-API.patch rename to patches/server/0741-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0744-Dolphin-API.patch b/patches/server/0742-Dolphin-API.patch similarity index 100% rename from patches/server/0744-Dolphin-API.patch rename to patches/server/0742-Dolphin-API.patch diff --git a/patches/server/0745-More-PotionEffectType-API.patch b/patches/server/0743-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0745-More-PotionEffectType-API.patch rename to patches/server/0743-More-PotionEffectType-API.patch diff --git a/patches/server/0746-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0744-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0746-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0744-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0747-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0745-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 98% rename from patches/server/0747-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0745-API-for-creating-command-sender-which-forwards-feedb.patch index fcd9ab105a..f0732e3393 100644 --- a/patches/server/0747-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/server/0745-API-for-creating-command-sender-which-forwards-feedb.patch @@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c5aa5bd2a9372d9d21ac600fdf4041d78186c002..44faa651250397ab5ceef0cd905bd4984b246a33 100644 +index e2308ca7bd457ada1e5c0535d10e97affef65612..3aa82952cfd0415288b434a6462123504e4dab99 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2110,6 +2110,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0748-Add-missing-structure-set-seed-configs.patch b/patches/server/0746-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0748-Add-missing-structure-set-seed-configs.patch rename to patches/server/0746-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0749-Implement-regenerateChunk.patch b/patches/server/0747-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0749-Implement-regenerateChunk.patch rename to patches/server/0747-Implement-regenerateChunk.patch diff --git a/patches/server/0750-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0748-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0750-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0748-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0751-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0749-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 92% rename from patches/server/0751-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0749-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 56a4a21224..16d4dac830 100644 --- a/patches/server/0751-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/server/0749-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 44faa651250397ab5ceef0cd905bd4984b246a33..bd452d9200179d9e385ff415822d8e810a8da30c 100644 +index 3aa82952cfd0415288b434a6462123504e4dab99..64224332b7e037330e87d96445a56afebb1e81a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2287,6 +2287,8 @@ public final class CraftServer implements Server { diff --git a/patches/server/0752-Add-GameEvent-tags.patch b/patches/server/0750-Add-GameEvent-tags.patch similarity index 97% rename from patches/server/0752-Add-GameEvent-tags.patch rename to patches/server/0750-Add-GameEvent-tags.patch index 2ad5887d87..40a6ea8d4a 100644 --- a/patches/server/0752-Add-GameEvent-tags.patch +++ b/patches/server/0750-Add-GameEvent-tags.patch @@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bd452d9200179d9e385ff415822d8e810a8da30c..48961913ed0a437129432cfa5fa707904d5bcdb2 100644 +index 64224332b7e037330e87d96445a56afebb1e81a2..a3eaa58625d96df5beb00b69b0c7c902f63865db 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2708,6 +2708,15 @@ public final class CraftServer implements Server { diff --git a/patches/server/0753-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0751-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0753-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0751-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0754-Furnace-RecipesUsed-API.patch b/patches/server/0752-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0754-Furnace-RecipesUsed-API.patch rename to patches/server/0752-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0755-Configurable-sculk-sensor-listener-range.patch b/patches/server/0753-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0755-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0753-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0756-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0754-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0756-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0754-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0757-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0755-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0757-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0755-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0758-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0756-Put-world-into-worldlist-before-initing-the-world.patch similarity index 95% rename from patches/server/0758-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0756-Put-world-into-worldlist-before-initing-the-world.patch index ea31a814cb..5088a1cf51 100644 --- a/patches/server/0758-Put-world-into-worldlist-before-initing-the-world.patch +++ b/patches/server/0756-Put-world-into-worldlist-before-initing-the-world.patch @@ -23,7 +23,7 @@ index 67bda174adb74e6176e81f986382b3bbbfe6b95f..4f43e306d70bc733ceba2b375c8732f3 if (worlddata.getCustomBossEvents() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 48961913ed0a437129432cfa5fa707904d5bcdb2..4ffb0a342a553b714a0807591a3d21d7a6b08959 100644 +index a3eaa58625d96df5beb00b69b0c7c902f63865db..316a901f5d943209d94ba6631cfaa9be43fdae3b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1288,10 +1288,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0759-Fix-Entity-Position-Desync.patch b/patches/server/0757-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0759-Fix-Entity-Position-Desync.patch rename to patches/server/0757-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0760-Custom-Potion-Mixes.patch b/patches/server/0758-Custom-Potion-Mixes.patch similarity index 99% rename from patches/server/0760-Custom-Potion-Mixes.patch rename to patches/server/0758-Custom-Potion-Mixes.patch index 9a12914604..c6c5fb5760 100644 --- a/patches/server/0760-Custom-Potion-Mixes.patch +++ b/patches/server/0758-Custom-Potion-Mixes.patch @@ -172,7 +172,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4ffb0a342a553b714a0807591a3d21d7a6b08959..4af7f37e12104f6a493c08aff2968762bbdc4811 100644 +index 316a901f5d943209d94ba6631cfaa9be43fdae3b..536057656dfb7af96977b692b854e5a4fff98dd9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -304,6 +304,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0761-Force-close-world-loading-screen.patch b/patches/server/0759-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0761-Force-close-world-loading-screen.patch rename to patches/server/0759-Force-close-world-loading-screen.patch diff --git a/patches/server/0762-Fix-falling-block-spawn-methods.patch b/patches/server/0760-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0762-Fix-falling-block-spawn-methods.patch rename to patches/server/0760-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0763-Expose-furnace-minecart-push-values.patch b/patches/server/0761-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0763-Expose-furnace-minecart-push-values.patch rename to patches/server/0761-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0764-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0762-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0764-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0762-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0765-More-Projectile-API.patch b/patches/server/0763-More-Projectile-API.patch similarity index 100% rename from patches/server/0765-More-Projectile-API.patch rename to patches/server/0763-More-Projectile-API.patch diff --git a/patches/server/0766-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0764-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0766-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0764-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0767-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0765-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0767-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0765-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0768-Implement-getComputedBiome-API.patch b/patches/server/0766-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0768-Implement-getComputedBiome-API.patch rename to patches/server/0766-Implement-getComputedBiome-API.patch diff --git a/patches/server/0769-Make-some-itemstacks-nonnull.patch b/patches/server/0767-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0769-Make-some-itemstacks-nonnull.patch rename to patches/server/0767-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0770-Implement-enchantWithLevels-API.patch b/patches/server/0768-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0770-Implement-enchantWithLevels-API.patch rename to patches/server/0768-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0771-Fix-saving-in-unloadWorld.patch b/patches/server/0769-Fix-saving-in-unloadWorld.patch similarity index 90% rename from patches/server/0771-Fix-saving-in-unloadWorld.patch rename to patches/server/0769-Fix-saving-in-unloadWorld.patch index 24b31ecfa3..0110c67e88 100644 --- a/patches/server/0771-Fix-saving-in-unloadWorld.patch +++ b/patches/server/0769-Fix-saving-in-unloadWorld.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4af7f37e12104f6a493c08aff2968762bbdc4811..50a941add66d160ce3328d869238bab73215be5e 100644 +index 536057656dfb7af96977b692b854e5a4fff98dd9..f9b994a024be198a26d0213b9c98fc46987549a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1336,7 +1336,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0772-Buffer-OOB-setBlock-calls.patch b/patches/server/0770-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0772-Buffer-OOB-setBlock-calls.patch rename to patches/server/0770-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0773-Add-TameableDeathMessageEvent.patch b/patches/server/0771-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0773-Add-TameableDeathMessageEvent.patch rename to patches/server/0771-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0774-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0772-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0774-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0772-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0775-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0773-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0775-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0773-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0776-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0774-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0776-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0774-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0777-Guard-against-invalid-entity-positions.patch b/patches/server/0775-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0777-Guard-against-invalid-entity-positions.patch rename to patches/server/0775-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0778-cache-resource-keys.patch b/patches/server/0776-cache-resource-keys.patch similarity index 100% rename from patches/server/0778-cache-resource-keys.patch rename to patches/server/0776-cache-resource-keys.patch diff --git a/patches/server/0779-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0777-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0779-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0777-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0780-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0778-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0780-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0778-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0781-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0779-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0781-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0779-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0782-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0780-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0782-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0780-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0783-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0781-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0783-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0781-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0784-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0782-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 99% rename from patches/server/0784-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0782-Pass-ServerLevel-for-gamerule-callbacks.patch index 203c8ac7fd..5a24996368 100644 --- a/patches/server/0784-Pass-ServerLevel-for-gamerule-callbacks.patch +++ b/patches/server/0782-Pass-ServerLevel-for-gamerule-callbacks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index c9af6ba082d1d387aa2e6ecf5fb4647d994447f4..62c66bb3bcb1cb0a09011aa81bbb39f23623506f 100644 +index e69a0121c8644d831cbb8bc1c95d9219d1c343da..4d7124ae7cefcc8c65bf74ac9d3c103fe6817c42 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0785-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0783-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0785-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0783-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0786-WorldCreator-keepSpawnLoaded.patch b/patches/server/0784-WorldCreator-keepSpawnLoaded.patch similarity index 94% rename from patches/server/0786-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0784-WorldCreator-keepSpawnLoaded.patch index 7a1ddbe39c..74001a685d 100644 --- a/patches/server/0786-WorldCreator-keepSpawnLoaded.patch +++ b/patches/server/0784-WorldCreator-keepSpawnLoaded.patch @@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 50a941add66d160ce3328d869238bab73215be5e..4642cfb862549c4b3d7e64ac6f040b7cf54d3793 100644 +index f9b994a024be198a26d0213b9c98fc46987549a4..08eb6f115fe5fb2414a35010faa91d6fab7db0e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1283,7 +1283,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0787-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0785-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0787-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0785-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0788-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0786-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0788-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0786-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0789-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0787-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0789-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0787-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0790-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0788-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0790-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0788-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0791-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0789-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0791-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0789-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0792-Add-PlayerStopUsingItemEvent.patch b/patches/server/0790-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0792-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0790-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0793-Don-t-tick-markers.patch b/patches/server/0791-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0793-Don-t-tick-markers.patch rename to patches/server/0791-Don-t-tick-markers.patch diff --git a/patches/server/0794-Expand-FallingBlock-API.patch b/patches/server/0792-Expand-FallingBlock-API.patch similarity index 100% rename from patches/server/0794-Expand-FallingBlock-API.patch rename to patches/server/0792-Expand-FallingBlock-API.patch diff --git a/patches/server/0795-Do-not-accept-invalid-client-settings.patch b/patches/server/0793-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0795-Do-not-accept-invalid-client-settings.patch rename to patches/server/0793-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0796-Add-support-for-Proxy-Protocol.patch b/patches/server/0794-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0796-Add-support-for-Proxy-Protocol.patch rename to patches/server/0794-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0797-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0795-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0797-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0795-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0798-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0796-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0798-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0796-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0799-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0797-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0799-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0797-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0800-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0798-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0800-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0798-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0801-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0799-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0801-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0799-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0802-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0800-Throw-exception-on-world-create-while-being-ticked.patch similarity index 97% rename from patches/server/0802-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0800-Throw-exception-on-world-create-while-being-ticked.patch index 7c6b011e73..7b59f847f3 100644 --- a/patches/server/0802-Throw-exception-on-world-create-while-being-ticked.patch +++ b/patches/server/0800-Throw-exception-on-world-create-while-being-ticked.patch @@ -45,7 +45,7 @@ index d8eb1dbc1601c1f76183ddd78b88d0ee6df68bed..002511a54565aab9eb4552fecdf974fe this.profiler.popPush("connection"); MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4642cfb862549c4b3d7e64ac6f040b7cf54d3793..de2cd044c5aaf8aca922443374b7a10aafd6f03e 100644 +index 08eb6f115fe5fb2414a35010faa91d6fab7db0e2..398a89a1f695f1e99b30ca0d5ebb192c8f465748 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -874,6 +874,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0803-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0801-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0803-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0801-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0804-Dont-resent-entity-on-art-update.patch b/patches/server/0802-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0804-Dont-resent-entity-on-art-update.patch rename to patches/server/0802-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0805-Add-WardenAngerChangeEvent.patch b/patches/server/0803-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0805-Add-WardenAngerChangeEvent.patch rename to patches/server/0803-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0806-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0804-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0806-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0804-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0807-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0805-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0807-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0805-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0808-Nameable-Banner-API.patch b/patches/server/0806-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0808-Nameable-Banner-API.patch rename to patches/server/0806-Nameable-Banner-API.patch diff --git a/patches/server/0809-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0807-Don-t-broadcast-messages-to-command-blocks.patch similarity index 95% rename from patches/server/0809-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0807-Don-t-broadcast-messages-to-command-blocks.patch index 5f36d0ac98..34bc1d83ab 100644 --- a/patches/server/0809-Don-t-broadcast-messages-to-command-blocks.patch +++ b/patches/server/0807-Don-t-broadcast-messages-to-command-blocks.patch @@ -20,7 +20,7 @@ index c56f5173fda6b38c2dcaea196217f2f5a7d7c641..d4ff8c6b7801e33be4ff69b8bae13c09 Date date = new Date(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index de2cd044c5aaf8aca922443374b7a10aafd6f03e..2d12d59974224d1adaf862e5a9bbffe804bd07ce 100644 +index 398a89a1f695f1e99b30ca0d5ebb192c8f465748..84d6b1b3ec3972281218cbe5e72c9d4ce6419c59 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1873,7 +1873,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0810-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0808-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0810-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0808-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0811-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0809-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0811-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0809-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0812-Add-Player-getFishHook.patch b/patches/server/0810-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0812-Add-Player-getFishHook.patch rename to patches/server/0810-Add-Player-getFishHook.patch diff --git a/patches/server/0813-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0811-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0813-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0811-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0814-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0812-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0814-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0812-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0815-Fix-Bee-flower-NPE.patch b/patches/server/0813-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0815-Fix-Bee-flower-NPE.patch rename to patches/server/0813-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0816-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0814-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0816-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0814-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0817-More-Teleport-API.patch b/patches/server/0815-More-Teleport-API.patch similarity index 100% rename from patches/server/0817-More-Teleport-API.patch rename to patches/server/0815-More-Teleport-API.patch diff --git a/patches/server/0818-Add-EntityPortalReadyEvent.patch b/patches/server/0816-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0818-Add-EntityPortalReadyEvent.patch rename to patches/server/0816-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0819-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0817-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0819-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0817-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0820-Send-block-entities-after-destroy-prediction.patch b/patches/server/0818-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0820-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0818-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0821-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0819-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0821-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0819-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0822-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0820-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0822-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0820-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0823-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0821-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0823-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0821-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0824-Collision-API.patch b/patches/server/0822-Collision-API.patch similarity index 100% rename from patches/server/0824-Collision-API.patch rename to patches/server/0822-Collision-API.patch diff --git a/patches/server/0825-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0823-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0825-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0823-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0826-Block-Ticking-API.patch b/patches/server/0824-Block-Ticking-API.patch similarity index 100% rename from patches/server/0826-Block-Ticking-API.patch rename to patches/server/0824-Block-Ticking-API.patch diff --git a/patches/server/0827-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0825-Add-Velocity-IP-Forwarding-Support.patch similarity index 97% rename from patches/server/0827-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0825-Add-Velocity-IP-Forwarding-Support.patch index b2324c5ee6..3f8870171a 100644 --- a/patches/server/0827-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/server/0825-Add-Velocity-IP-Forwarding-Support.patch @@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..a34381122de53123169927e181df6628 + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 62c66bb3bcb1cb0a09011aa81bbb39f23623506f..5969f45d479188aceedfbe7931c69c36de78a705 100644 +index 4d7124ae7cefcc8c65bf74ac9d3c103fe6817c42..9d7e1b306f8c96883dbe1adbf7e77825da4cbc21 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -274,13 +274,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -123,7 +123,7 @@ index 62c66bb3bcb1cb0a09011aa81bbb39f23623506f..5969f45d479188aceedfbe7931c69c36 DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose."); } diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 08a65700909dd64e6e15fac5c6542b02a864782b..9a5ce6fff9fc2bf18e9fb4bf304584fbbf78b621 100644 +index 6121a3879eeb1d13653e93da02ecdbbcb2a866ac..b9117be53b8b8b37af54621f54480f275546f0fd 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -64,6 +64,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, @@ -217,7 +217,7 @@ index 08a65700909dd64e6e15fac5c6542b02a864782b..9a5ce6fff9fc2bf18e9fb4bf304584fb } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2d12d59974224d1adaf862e5a9bbffe804bd07ce..0b4639e56b87319e78c1b46fb581d8bb74ead2e4 100644 +index 84d6b1b3ec3972281218cbe5e72c9d4ce6419c59..56e5dff13323068ad2911649e6285aa915d787bd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -803,7 +803,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0828-Add-NamespacedKey-biome-methods.patch b/patches/server/0826-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0828-Add-NamespacedKey-biome-methods.patch rename to patches/server/0826-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0829-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0827-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0829-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0827-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0830-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0828-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0830-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0828-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0831-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0829-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0831-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0829-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0832-Missing-eating-regain-reason.patch b/patches/server/0830-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0832-Missing-eating-regain-reason.patch rename to patches/server/0830-Missing-eating-regain-reason.patch diff --git a/patches/server/0833-Missing-effect-cause.patch b/patches/server/0831-Missing-effect-cause.patch similarity index 100% rename from patches/server/0833-Missing-effect-cause.patch rename to patches/server/0831-Missing-effect-cause.patch diff --git a/patches/server/0834-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0832-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0834-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0832-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0835-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0833-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0835-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0833-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0836-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0834-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0836-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0834-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0837-Configurable-chat-thread-limit.patch b/patches/server/0835-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0837-Configurable-chat-thread-limit.patch rename to patches/server/0835-Configurable-chat-thread-limit.patch diff --git a/patches/server/0838-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0836-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0838-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0836-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0839-fix-Jigsaw-block-kicking-user.patch b/patches/server/0837-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0839-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0837-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0840-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0838-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0840-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0838-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0841-Add-getDrops-to-BlockState.patch b/patches/server/0839-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0841-Add-getDrops-to-BlockState.patch rename to patches/server/0839-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0842-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0840-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0842-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0840-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0843-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0841-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0843-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0841-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0844-Fix-custom-piglin-loved-items.patch b/patches/server/0842-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0844-Fix-custom-piglin-loved-items.patch rename to patches/server/0842-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0845-EntityPickupItemEvent-fixes.patch b/patches/server/0843-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0845-EntityPickupItemEvent-fixes.patch rename to patches/server/0843-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0846-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0844-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0846-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0844-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0847-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0845-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0847-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0845-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0848-Elder-Guardian-appearance-API.patch b/patches/server/0846-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0848-Elder-Guardian-appearance-API.patch rename to patches/server/0846-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0849-Allow-changing-bed-s-occupied-property.patch b/patches/server/0847-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0849-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0847-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0850-Add-entity-knockback-API.patch b/patches/server/0848-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0850-Add-entity-knockback-API.patch rename to patches/server/0848-Add-entity-knockback-API.patch diff --git a/patches/server/0851-Detect-headless-JREs.patch b/patches/server/0849-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0851-Detect-headless-JREs.patch rename to patches/server/0849-Detect-headless-JREs.patch diff --git a/patches/server/0852-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0850-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0852-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0850-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0853-optimized-dirt-and-snow-spreading.patch b/patches/server/0851-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0853-optimized-dirt-and-snow-spreading.patch rename to patches/server/0851-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0854-Added-EntityToggleSitEvent.patch b/patches/server/0852-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0854-Added-EntityToggleSitEvent.patch rename to patches/server/0852-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0855-Add-fire-tick-delay-option.patch b/patches/server/0853-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0855-Add-fire-tick-delay-option.patch rename to patches/server/0853-Add-fire-tick-delay-option.patch diff --git a/patches/server/0856-Add-Moving-Piston-API.patch b/patches/server/0854-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0856-Add-Moving-Piston-API.patch rename to patches/server/0854-Add-Moving-Piston-API.patch diff --git a/patches/server/0857-Ignore-impossible-spawn-tick.patch b/patches/server/0855-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0857-Ignore-impossible-spawn-tick.patch rename to patches/server/0855-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0858-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0856-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0858-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0856-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0859-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0857-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0859-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0857-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0860-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0858-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0860-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0858-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0861-Prevent-compass-from-loading-chunks.patch b/patches/server/0859-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0861-Prevent-compass-from-loading-chunks.patch rename to patches/server/0859-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0862-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0860-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0862-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0860-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0863-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0861-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0863-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0861-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0864-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0862-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0864-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0862-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0865-Add-Player-Warden-Warning-API.patch b/patches/server/0863-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0865-Add-Player-Warden-Warning-API.patch rename to patches/server/0863-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0866-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0864-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0866-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0864-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0867-Add-paper-dumplisteners-command.patch b/patches/server/0865-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0867-Add-paper-dumplisteners-command.patch rename to patches/server/0865-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0868-check-global-player-list-where-appropriate.patch b/patches/server/0866-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0868-check-global-player-list-where-appropriate.patch rename to patches/server/0866-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0869-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0867-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0869-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0867-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0870-ItemStack-damage-API.patch b/patches/server/0868-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0870-ItemStack-damage-API.patch rename to patches/server/0868-ItemStack-damage-API.patch diff --git a/patches/server/0871-Friction-API.patch b/patches/server/0869-Friction-API.patch similarity index 100% rename from patches/server/0871-Friction-API.patch rename to patches/server/0869-Friction-API.patch diff --git a/patches/server/0872-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0870-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0872-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0870-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0873-Fix-player-kick-on-shutdown.patch b/patches/server/0871-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0873-Fix-player-kick-on-shutdown.patch rename to patches/server/0871-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0874-Sync-offhand-slot-in-menus.patch b/patches/server/0872-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0874-Sync-offhand-slot-in-menus.patch rename to patches/server/0872-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0875-Player-Entity-Tracking-Events.patch b/patches/server/0873-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0875-Player-Entity-Tracking-Events.patch rename to patches/server/0873-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0876-Limit-pet-look-distance.patch b/patches/server/0874-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0876-Limit-pet-look-distance.patch rename to patches/server/0874-Limit-pet-look-distance.patch diff --git a/patches/server/0877-Properly-resend-entities.patch b/patches/server/0875-Properly-resend-entities.patch similarity index 100% rename from patches/server/0877-Properly-resend-entities.patch rename to patches/server/0875-Properly-resend-entities.patch diff --git a/patches/server/0878-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0876-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0878-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0876-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0879-fix-Instruments.patch b/patches/server/0877-fix-Instruments.patch similarity index 100% rename from patches/server/0879-fix-Instruments.patch rename to patches/server/0877-fix-Instruments.patch diff --git a/patches/server/0880-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0878-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0880-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0878-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0881-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0879-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0881-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0879-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0882-Add-BlockLockCheckEvent.patch b/patches/server/0880-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0882-Add-BlockLockCheckEvent.patch rename to patches/server/0880-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0883-Add-Sneaking-API-for-Entities.patch b/patches/server/0881-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0883-Add-Sneaking-API-for-Entities.patch rename to patches/server/0881-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0884-Improve-logging-and-errors.patch b/patches/server/0882-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0884-Improve-logging-and-errors.patch rename to patches/server/0882-Improve-logging-and-errors.patch diff --git a/patches/server/0885-Improve-PortalEvents.patch b/patches/server/0883-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0885-Improve-PortalEvents.patch rename to patches/server/0883-Improve-PortalEvents.patch diff --git a/patches/server/0886-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0884-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0886-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0884-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0887-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0885-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0887-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0885-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0888-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0886-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0888-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0886-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0889-Flying-Fall-Damage.patch b/patches/server/0887-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0889-Flying-Fall-Damage.patch rename to patches/server/0887-Flying-Fall-Damage.patch diff --git a/patches/server/0890-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0888-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0890-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0888-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0891-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0889-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0891-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0889-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0892-config-for-disabling-entity-tag-tags.patch b/patches/server/0890-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0892-config-for-disabling-entity-tag-tags.patch rename to patches/server/0890-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0893-Use-single-player-info-update-packet-on-join.patch b/patches/server/0891-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0893-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0891-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0894-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0892-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0894-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0892-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0895-Win-Screen-API.patch b/patches/server/0893-Win-Screen-API.patch similarity index 100% rename from patches/server/0895-Win-Screen-API.patch rename to patches/server/0893-Win-Screen-API.patch diff --git a/patches/server/0896-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0894-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0896-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0894-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0897-Fix-force-opening-enchantment-tables.patch b/patches/server/0895-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0897-Fix-force-opening-enchantment-tables.patch rename to patches/server/0895-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0898-Add-Entity-Body-Yaw-API.patch b/patches/server/0896-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0898-Add-Entity-Body-Yaw-API.patch rename to patches/server/0896-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0899-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0897-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0899-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0897-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0900-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0898-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0900-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0898-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0901-Add-EntityFertilizeEggEvent.patch b/patches/server/0899-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0901-Add-EntityFertilizeEggEvent.patch rename to patches/server/0899-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0902-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0900-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0902-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0900-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0903-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0901-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0903-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0901-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0904-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0902-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0904-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0902-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0905-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0903-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0905-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0903-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0906-Fix-text-display-error-on-spawn.patch b/patches/server/0904-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0906-Fix-text-display-error-on-spawn.patch rename to patches/server/0904-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0907-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0905-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0907-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0905-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0908-Add-Shearable-API.patch b/patches/server/0906-Add-Shearable-API.patch similarity index 100% rename from patches/server/0908-Add-Shearable-API.patch rename to patches/server/0906-Add-Shearable-API.patch diff --git a/patches/server/0909-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0907-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0909-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0907-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0910-Optimize-Hoppers.patch b/patches/server/0908-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0910-Optimize-Hoppers.patch rename to patches/server/0908-Optimize-Hoppers.patch diff --git a/patches/server/0911-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0909-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0911-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0909-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0912-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0910-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0912-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0910-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0913-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0911-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0913-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0911-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0914-remove-duplicate-animate-packet-for-records.patch b/patches/server/0912-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0914-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0912-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0915-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0913-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0915-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0913-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0916-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0914-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0916-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0914-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0917-Use-array-for-gamerule-storage.patch b/patches/server/0915-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0917-Use-array-for-gamerule-storage.patch rename to patches/server/0915-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0918-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0916-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0918-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0916-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0919-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0917-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0919-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0917-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0920-Add-Mob-Experience-reward-API.patch b/patches/server/0918-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0920-Add-Mob-Experience-reward-API.patch rename to patches/server/0918-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0921-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0919-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0921-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0919-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0922-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0920-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0922-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0920-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0923-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0921-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0923-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0921-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0924-More-accurate-isInOpenWater-impl.patch b/patches/server/0922-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0924-More-accurate-isInOpenWater-impl.patch rename to patches/server/0922-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0925-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0923-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0925-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0923-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0926-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0924-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0926-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0924-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0927-Expand-PlayerItemMendEvent.patch b/patches/server/0925-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0927-Expand-PlayerItemMendEvent.patch rename to patches/server/0925-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0928-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0926-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0928-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0926-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0929-Add-transient-modifier-API.patch b/patches/server/0927-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0929-Add-transient-modifier-API.patch rename to patches/server/0927-Add-transient-modifier-API.patch diff --git a/patches/server/0930-Fix-block-place-logic.patch b/patches/server/0928-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0930-Fix-block-place-logic.patch rename to patches/server/0928-Fix-block-place-logic.patch diff --git a/patches/server/0931-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0929-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0931-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0929-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0932-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0930-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0932-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0930-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0931-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 94% rename from patches/server/0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0931-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch index 0fec15f9b7..19c94cb4d0 100644 --- a/patches/server/0933-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch +++ b/patches/server/0931-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0b4639e56b87319e78c1b46fb581d8bb74ead2e4..4310134fe9cb74cb11591d52562bc35039130d19 100644 +index 56e5dff13323068ad2911649e6285aa915d787bd..d0cc462f3ca02218978ac14358d533e3a4d8b066 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -352,7 +352,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0934-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0932-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0934-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0932-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0935-Fix-sniffer-removeExploredLocation.patch b/patches/server/0933-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0935-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0933-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0936-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0934-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0936-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0934-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0937-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0935-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/server/0937-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0935-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/server/0938-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0936-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0938-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0936-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0939-Properly-Cancel-Usable-Items.patch b/patches/server/0937-Properly-Cancel-Usable-Items.patch similarity index 100% rename from patches/server/0939-Properly-Cancel-Usable-Items.patch rename to patches/server/0937-Properly-Cancel-Usable-Items.patch diff --git a/patches/server/0940-Add-event-for-player-editing-sign.patch b/patches/server/0938-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0940-Add-event-for-player-editing-sign.patch rename to patches/server/0938-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0941-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0939-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0941-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0939-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0942-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0940-Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/server/0942-Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/server/0940-Fix-cmd-permission-levels-for-command-blocks.patch diff --git a/patches/server/0943-Add-option-to-disable-block-updates.patch b/patches/server/0941-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0943-Add-option-to-disable-block-updates.patch rename to patches/server/0941-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0944-Call-missing-BlockDispenseEvent.patch b/patches/server/0942-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0944-Call-missing-BlockDispenseEvent.patch rename to patches/server/0942-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0945-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0943-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0945-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0943-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0946-Optimize-player-lookups-for-beacons.patch b/patches/server/0944-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0946-Optimize-player-lookups-for-beacons.patch rename to patches/server/0944-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0947-Add-Sign-getInteractableSideFor.patch b/patches/server/0945-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0947-Add-Sign-getInteractableSideFor.patch rename to patches/server/0945-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0948-Array-backed-synched-entity-data.patch b/patches/server/0946-Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/0948-Array-backed-synched-entity-data.patch rename to patches/server/0946-Array-backed-synched-entity-data.patch diff --git a/patches/server/0949-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0947-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0949-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0947-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0950-Fix-BanList-API.patch b/patches/server/0948-Fix-BanList-API.patch similarity index 100% rename from patches/server/0950-Fix-BanList-API.patch rename to patches/server/0948-Fix-BanList-API.patch diff --git a/patches/server/0951-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0949-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 81% rename from patches/server/0951-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0949-Determine-lava-and-water-fluid-explosion-resistance-.patch index 05fb1ac2ac..40890b3d28 100644 --- a/patches/server/0951-Determine-lava-and-water-fluid-explosion-resistance-.patch +++ b/patches/server/0949-Determine-lava-and-water-fluid-explosion-resistance-.patch @@ -9,7 +9,7 @@ When selecting which explosion resistance to use for lava and water, vanilla sel Problems emerge when we want to reduce the explosion resistance of water or lava, since the fluid explosion resistance is hardcoded to return 100.0F and can't be changed by a plugin. This simply makes the fluid explosion resistance the same as the block explosion resistance, which allows plugin to change the value. Since both are the same in vanilla, this has no side effects on servers that do not need to do this. diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java -index 72f8b72c6436ca3b8eaeb39c7d3efe2c1462ae1d..c3f8e1e2dd89c168b8b4a15b589109db486bc8d7 100644 +index 72f8b72c6436ca3b8eaeb39c7d3efe2c1462ae1d..3bb4a9a1a6249e8ba2de237f801210e7f4fd5825 100644 --- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java +++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java @@ -232,7 +232,7 @@ public abstract class LavaFluid extends FlowingFluid { @@ -17,12 +17,12 @@ index 72f8b72c6436ca3b8eaeb39c7d3efe2c1462ae1d..c3f8e1e2dd89c168b8b4a15b589109db @Override protected float getExplosionResistance() { - return 100.0F; -+ return Blocks.LAVA.getExplosionResistance(); // Paper ++ return Blocks.LAVA.getExplosionResistance(); // Paper - Get explosion resistance from actual block } @Override diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java -index 82e85fbbd45244d02df90fa00c9046e7f51275a2..d280c98aed5262c4ce39526c917de884f25a8584 100644 +index 82e85fbbd45244d02df90fa00c9046e7f51275a2..d8c26b02188a6d443c6ec73bd5fa2fa8197a5e59 100644 --- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java +++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java @@ -109,7 +109,7 @@ public abstract class WaterFluid extends FlowingFluid { @@ -30,7 +30,7 @@ index 82e85fbbd45244d02df90fa00c9046e7f51275a2..d280c98aed5262c4ce39526c917de884 @Override protected float getExplosionResistance() { - return 100.0F; -+ return Blocks.WATER.getExplosionResistance(); // Paper ++ return Blocks.WATER.getExplosionResistance(); // Paper - Get explosion resistance from actual block } @Override diff --git a/patches/server/0952-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0950-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0952-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0950-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0953-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0951-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0953-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0951-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0954-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0952-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 88% rename from patches/server/0954-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0952-ExperienceOrb-should-call-EntitySpawnEvent.patch index dfc52d60b6..e6d854a0e3 100644 --- a/patches/server/0954-ExperienceOrb-should-call-EntitySpawnEvent.patch +++ b/patches/server/0952-ExperienceOrb-should-call-EntitySpawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5ead89e46d9cf17980baf35cda000bc4c0e7425b..2299cff413241aa97e9f498eb0dea51575e364ae 100644 +index 5ead89e46d9cf17980baf35cda000bc4c0e7425b..7fe4d29f7734ba9642f1a64c161df7d24b88a18a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -734,7 +734,10 @@ public class CraftEventFactory { @@ -13,10 +13,10 @@ index 5ead89e46d9cf17980baf35cda000bc4c0e7425b..2299cff413241aa97e9f498eb0dea515 if (entity instanceof net.minecraft.world.entity.ExperienceOrb xp) { double radius = world.spigotConfig.expMerge; - if (radius > 0) { -+ // Paper start - Call EntitySpawnEvent for ExperienceOrb entities. ++ // Paper start - Call EntitySpawnEvent for ExperienceOrb entities + event = CraftEventFactory.callEntitySpawnEvent(entity); + if (radius > 0 && !event.isCancelled() && !entity.isRemoved()) { -+ // Paper end ++ // Paper end - Call EntitySpawnEvent for ExperienceOrb entities // Paper start - Maximum exp value when merging - Whole section has been tweaked, see comments for specifics final int maxValue = world.paperConfig().entities.behavior.experienceMergeMaxValue; final boolean mergeUnconditionally = world.paperConfig().entities.behavior.experienceMergeMaxValue <= 0; diff --git a/patches/server/0955-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0953-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 88% rename from patches/server/0955-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0953-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch index 392fad1ce8..b2837d4486 100644 --- a/patches/server/0955-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch +++ b/patches/server/0953-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make Amethyst throw both Spread and Grow Events diff --git a/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java b/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java -index 79f1fb45447350b5bedee8ce3efe6c150aa9772c..ee24eac5e37a2fd0c8c37365ea10d03749beb9a7 100644 +index 79f1fb45447350b5bedee8ce3efe6c150aa9772c..617c35f8e2877be193693548b5af17c50d013e47 100644 --- a/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java @@ -45,7 +45,13 @@ public class BuddingAmethystBlock extends AmethystBlock { @@ -18,7 +18,7 @@ index 79f1fb45447350b5bedee8ce3efe6c150aa9772c..ee24eac5e37a2fd0c8c37365ea10d037 + } else { + org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, blockposition1, iblockdata2); + } -+ // Paper end ++ // Paper end - Have Amethyst throw both spread and grow events } } diff --git a/patches/server/0956-Add-whitelist-events.patch b/patches/server/0954-Add-whitelist-events.patch similarity index 91% rename from patches/server/0956-Add-whitelist-events.patch rename to patches/server/0954-Add-whitelist-events.patch index 42eff5bfe1..44cddb390d 100644 --- a/patches/server/0956-Add-whitelist-events.patch +++ b/patches/server/0954-Add-whitelist-events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add whitelist events diff --git a/src/main/java/net/minecraft/server/players/UserWhiteList.java b/src/main/java/net/minecraft/server/players/UserWhiteList.java -index a6c70decad1a496595944a5dd2aeeb387757fef3..e5c218833f5bcb1c908cd62bdc57cc5152d37be5 100644 +index a6c70decad1a496595944a5dd2aeeb387757fef3..37635f58cd78ff50991dde413470004400259c89 100644 --- a/src/main/java/net/minecraft/server/players/UserWhiteList.java +++ b/src/main/java/net/minecraft/server/players/UserWhiteList.java @@ -30,4 +30,23 @@ public class UserWhiteList extends StoredUserList collisionsBB = new java.util.ArrayList<>(); diff --git a/patches/server/0958-Folia-scheduler-and-owned-region-API.patch b/patches/server/0956-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/server/0958-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0956-Folia-scheduler-and-owned-region-API.patch index ca3ecfa30b..d1bfe767a5 100644 --- a/patches/server/0958-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0956-Folia-scheduler-and-owned-region-API.patch @@ -1251,7 +1251,7 @@ index a2607d0782e8d72d7e531a2b078674bc78daa5e3..687f7358466302195ec564ca5c817b13 public void setLevelCallback(EntityInLevelCallback changeListener) { this.levelCallback = changeListener; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4310134fe9cb74cb11591d52562bc35039130d19..8d92fe2b91bc1a68df05c0833acd964dbfbcc312 100644 +index d0cc462f3ca02218978ac14358d533e3a4d8b066..e321af528d356317da3753b73ccbc6af860f2618 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -306,6 +306,76 @@ public final class CraftServer implements Server { diff --git a/patches/server/0959-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0957-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0959-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0957-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0960-API-for-updating-recipes-on-clients.patch b/patches/server/0958-API-for-updating-recipes-on-clients.patch similarity index 77% rename from patches/server/0960-API-for-updating-recipes-on-clients.patch rename to patches/server/0958-API-for-updating-recipes-on-clients.patch index d677fe2f52..eedc91b176 100644 --- a/patches/server/0960-API-for-updating-recipes-on-clients.patch +++ b/patches/server/0958-API-for-updating-recipes-on-clients.patch @@ -5,20 +5,20 @@ Subject: [PATCH] API for updating recipes on clients diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 69e75aec30e8c25f621c8e7d024abe672395a0ef..683317e8c008fdb501e981490fd62f94597f2fee 100644 +index 69e75aec30e8c25f621c8e7d024abe672395a0ef..b33f6f3ceb279eb5a36df7d37d56bfce951c3de7 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1545,6 +1545,13 @@ public abstract class PlayerList { } public void reloadResources() { -+ // Paper start - split this method up into separate methods ++ // Paper start - API for updating recipes on clients + this.reloadAdvancementData(); + this.reloadTagData(); + this.reloadRecipeData(); + } + public void reloadAdvancementData() { -+ // Paper end ++ // Paper end - API for updating recipes on clients // CraftBukkit start /*Iterator iterator = this.advancements.values().iterator(); @@ -26,27 +26,27 @@ index 69e75aec30e8c25f621c8e7d024abe672395a0ef..683317e8c008fdb501e981490fd62f94 } // CraftBukkit end -+ // Paper start ++ // Paper start - API for updating recipes on clients + } + public void reloadTagData() { -+ // Paper end ++ // Paper end - API for updating recipes on clients this.broadcastAll(new ClientboundUpdateTagsPacket(TagNetworkSerialization.serializeTagsToNetwork(this.registries))); -+ // Paper start ++ // Paper start - API for updating recipes on clients + } + public void reloadRecipeData() { -+ // Paper end ++ // Paper end - API for updating recipes on clients ClientboundUpdateRecipesPacket packetplayoutrecipeupdate = new ClientboundUpdateRecipesPacket(this.server.getRecipeManager().getRecipes()); Iterator iterator1 = this.players.iterator(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8d92fe2b91bc1a68df05c0833acd964dbfbcc312..2c044fc1d5c26c68a103932f516e0625b83f4da7 100644 +index e321af528d356317da3753b73ccbc6af860f2618..d26982e05cdcd5f822f1f0d9142ddbf4d08a6891 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1129,6 +1129,18 @@ public final class CraftServer implements Server { ReloadCommand.reload(this.console); } -+ // Paper start ++ // Paper start - API for updating recipes on clients + @Override + public void updateResources() { + this.playerList.reloadResources(); @@ -56,7 +56,7 @@ index 8d92fe2b91bc1a68df05c0833acd964dbfbcc312..2c044fc1d5c26c68a103932f516e0625 + public void updateRecipes() { + this.playerList.reloadRecipeData(); + } -+ // Paper end ++ // Paper end - API for updating recipes on clients + private void loadIcon() { this.icon = new CraftIconCache(null); @@ -65,13 +65,13 @@ index 8d92fe2b91bc1a68df05c0833acd964dbfbcc312..2c044fc1d5c26c68a103932f516e0625 @Override public boolean addRecipe(Recipe recipe) { -+ // Paper start ++ // Paper start - API for updating recipes on clients + return this.addRecipe(recipe, false); + } + + @Override + public boolean addRecipe(Recipe recipe, boolean resendRecipes) { -+ // Paper end ++ // Paper end - API for updating recipes on clients CraftRecipe toAdd; if (recipe instanceof CraftRecipe) { toAdd = (CraftRecipe) recipe; @@ -79,11 +79,11 @@ index 8d92fe2b91bc1a68df05c0833acd964dbfbcc312..2c044fc1d5c26c68a103932f516e0625 } } toAdd.addToCraftingManager(); -+ // Paper start ++ // Paper start - API for updating recipes on clients + if (resendRecipes) { + this.playerList.reloadRecipeData(); + } -+ // Paper end ++ // Paper end - API for updating recipes on clients return true; } @@ -91,13 +91,13 @@ index 8d92fe2b91bc1a68df05c0833acd964dbfbcc312..2c044fc1d5c26c68a103932f516e0625 @Override public boolean removeRecipe(NamespacedKey recipeKey) { -+ // Paper start ++ // Paper start - API for updating recipes on clients + return this.removeRecipe(recipeKey, false); + } + + @Override + public boolean removeRecipe(NamespacedKey recipeKey, boolean resendRecipes) { -+ // Paper end ++ // Paper end - API for updating recipes on clients Preconditions.checkArgument(recipeKey != null, "recipeKey == null"); ResourceLocation mcKey = CraftNamespacedKey.toMinecraft(recipeKey); diff --git a/patches/server/0961-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0959-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0961-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0959-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0962-Only-capture-actual-tree-growth.patch b/patches/server/0960-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0962-Only-capture-actual-tree-growth.patch rename to patches/server/0960-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0963-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0961-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 83% rename from patches/server/0963-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0961-Use-correct-source-for-mushroom-block-spread-event.patch index b5e0bc1a5e..b1a7bde7b7 100644 --- a/patches/server/0963-Use-correct-source-for-mushroom-block-spread-event.patch +++ b/patches/server/0961-Use-correct-source-for-mushroom-block-spread-event.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Use correct source for mushroom block spread event diff --git a/src/main/java/net/minecraft/world/level/block/MushroomBlock.java b/src/main/java/net/minecraft/world/level/block/MushroomBlock.java -index 5889cb1cdb64875f0d7a7c681808b45cdc661d8e..7368c76a01275223a7bd3df1d36e80a15f66edbb 100644 +index 5889cb1cdb64875f0d7a7c681808b45cdc661d8e..96f9ca2439a617b5f90b826d4fc99c857301b1c2 100644 --- a/src/main/java/net/minecraft/world/level/block/MushroomBlock.java +++ b/src/main/java/net/minecraft/world/level/block/MushroomBlock.java @@ -68,6 +68,7 @@ public class MushroomBlock extends BushBlock implements BonemealableBlock { } BlockPos blockposition2 = pos.offset(random.nextInt(3) - 1, random.nextInt(2) - random.nextInt(2), random.nextInt(3) - 1); -+ final BlockPos sourcePos = pos; // Paper ++ final BlockPos sourcePos = pos; // Paper - Use correct source for mushroom block spread event for (int j = 0; j < 4; ++j) { if (world.isEmptyBlock(blockposition2) && state.canSurvive(world, blockposition2)) { @@ -21,7 +21,7 @@ index 5889cb1cdb64875f0d7a7c681808b45cdc661d8e..7368c76a01275223a7bd3df1d36e80a1 if (world.isEmptyBlock(blockposition2) && state.canSurvive(world, blockposition2)) { - org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, pos, blockposition2, state, 2); // CraftBukkit -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, sourcePos, blockposition2, state, 2); // CraftBukkit // Paper ++ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, sourcePos, blockposition2, state, 2); // CraftBukkit // Paper - Use correct source for mushroom block spread event } } diff --git a/patches/server/0964-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0962-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0964-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0962-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0965-Use-correct-seed-on-api-world-load.patch b/patches/server/0963-Use-correct-seed-on-api-world-load.patch similarity index 90% rename from patches/server/0965-Use-correct-seed-on-api-world-load.patch rename to patches/server/0963-Use-correct-seed-on-api-world-load.patch index 915841f29f..d8c6ae0ff1 100644 --- a/patches/server/0965-Use-correct-seed-on-api-world-load.patch +++ b/patches/server/0963-Use-correct-seed-on-api-world-load.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2c044fc1d5c26c68a103932f516e0625b83f4da7..c986e6c25cb3865fe94e0c37a21701c7c5fa3e8d 100644 +index d26982e05cdcd5f822f1f0d9142ddbf4d08a6891..45818b55be7431e73245efc447a3dca21fdf95e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1347,7 +1347,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0966-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0964-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0966-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0964-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0967-Cache-map-ids-on-item-frames.patch b/patches/server/0965-Cache-map-ids-on-item-frames.patch similarity index 83% rename from patches/server/0967-Cache-map-ids-on-item-frames.patch rename to patches/server/0965-Cache-map-ids-on-item-frames.patch index 2c0fbde170..4233b66ea5 100644 --- a/patches/server/0967-Cache-map-ids-on-item-frames.patch +++ b/patches/server/0965-Cache-map-ids-on-item-frames.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache map ids on item frames diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 625a598eb5f3c9c5ea60ae9ea50974bb08abbf85..9f1b424f8437f0f859d4f177ecc52233ad8e3357 100644 +index 625a598eb5f3c9c5ea60ae9ea50974bb08abbf85..ec8fcc3f105c6265de02fcaabc4b51eca626aa5e 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -118,7 +118,7 @@ public class ServerEntity { @@ -13,19 +13,19 @@ index 625a598eb5f3c9c5ea60ae9ea50974bb08abbf85..9f1b424f8437f0f859d4f177ecc52233 if (this.level.paperConfig().maps.itemFrameCursorUpdateInterval > 0 && this.tickCount % this.level.paperConfig().maps.itemFrameCursorUpdateInterval == 0 && itemstack.getItem() instanceof MapItem) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks // Paper - Make item frame map cursor update interval configurable - Integer integer = MapItem.getMapId(itemstack); -+ Integer integer = entityitemframe.cachedMapId; // Paper ++ Integer integer = entityitemframe.cachedMapId; // Paper - Perf: Cache map ids on item frames MapItemSavedData worldmap = MapItem.getSavedData(integer, this.level); if (worldmap != null) { diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 9c11d0af958ec47408d238d34d30750d29ecdd88..69912c5b300b67394dce3876d2d96872033cf156 100644 +index 9c11d0af958ec47408d238d34d30750d29ecdd88..8994385e95df467166985083fbdaa89dc1949f91 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -50,6 +50,7 @@ public class ItemFrame extends HangingEntity { public static final int NUM_ROTATIONS = 8; public float dropChance; public boolean fixed; -+ public Integer cachedMapId; // Paper ++ public Integer cachedMapId; // Paper - Perf: Cache map ids on item frames public ItemFrame(EntityType type, Level world) { super(type, world); @@ -33,7 +33,7 @@ index 9c11d0af958ec47408d238d34d30750d29ecdd88..69912c5b300b67394dce3876d2d96872 } private void onItemChanged(ItemStack stack) { -+ this.cachedMapId = MapItem.getMapId(stack); // Paper ++ this.cachedMapId = MapItem.getMapId(stack); // Paper - Perf: Cache map ids on item frames if (!stack.isEmpty() && stack.getFrame() != this) { stack.setEntityRepresentation(this); } diff --git a/patches/server/0968-Fix-custom-statistic-criteria-creation.patch b/patches/server/0966-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0968-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0966-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0969-Bandaid-fix-for-Effect.patch b/patches/server/0967-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0969-Bandaid-fix-for-Effect.patch rename to patches/server/0967-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0970-SculkCatalyst-bloom-API.patch b/patches/server/0968-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0970-SculkCatalyst-bloom-API.patch rename to patches/server/0968-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0971-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0969-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0971-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0969-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0972-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0970-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 95% rename from patches/server/0972-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0970-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch index 028651b9f3..88e0ced558 100644 --- a/patches/server/0972-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch +++ b/patches/server/0970-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch @@ -73,18 +73,18 @@ index de27b8d578d429564038e01cef5f46d4d3d7e81c..42c42d599d5b4827693cfe3f6cf9a32e // CraftBukkit start public String displayName; diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index d08c7b0b52065980f1f13c5533ff6355028322db..3cdddda9c0618e95288b81b975d499c8dd30c05f 100644 +index d08c7b0b52065980f1f13c5533ff6355028322db..dc211c6aedc178ac50b7d05aab3662c422211cbd 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -277,6 +277,11 @@ public final class NaturalSpawner { // Paper start PreSpawnStatus doSpawning = isValidSpawnPostitionForType(world, group, structuremanager, chunkgenerator, biomesettingsmobs_c, blockposition_mutableblockposition, d2); -+ // Paper start - mob count backoff ++ // Paper start - per player mob count backoff + if (doSpawning == PreSpawnStatus.ABORT || doSpawning == PreSpawnStatus.CANCELLED) { + world.getChunkSource().chunkMap.updateFailurePlayerMobTypeMap(blockposition_mutableblockposition.getX() >> 4, blockposition_mutableblockposition.getZ() >> 4, group); + } -+ // Paper end - mob count backoff ++ // Paper end - per player mob count backoff if (doSpawning == PreSpawnStatus.ABORT) { return j; // Paper } diff --git a/patches/server/0973-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0971-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 96% rename from patches/server/0973-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0971-Deprecate-and-replace-methods-with-old-StructureType.patch index 02d04be28c..7ac8f482d8 100644 --- a/patches/server/0973-Deprecate-and-replace-methods-with-old-StructureType.patch +++ b/patches/server/0971-Deprecate-and-replace-methods-with-old-StructureType.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c986e6c25cb3865fe94e0c37a21701c7c5fa3e8d..0b68bd21b0e45d556ec9ae0a51507987dfed559c 100644 +index 45818b55be7431e73245efc447a3dca21fdf95e0..6f3a06eeadc9fd2ccab0622fc21819a9fb569956 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1951,6 +1951,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0974-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0972-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 90% rename from patches/server/0974-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0972-Don-t-tab-complete-namespaced-commands-if-send-names.patch index e66d5e6564..97bd8df990 100644 --- a/patches/server/0974-Don-t-tab-complete-namespaced-commands-if-send-names.patch +++ b/patches/server/0972-Don-t-tab-complete-namespaced-commands-if-send-names.patch @@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player requests tab-complete only commands. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a20e8910f1a4800708e587853ba9aea5cc0ebce2..fa3c26732778339cd84d53a28c6c938b50594f0f 100644 +index bed713a7c13cd11c2ea7d8397aee1159f42eac7d..4f511fd74abe7a666fd12a514d65846f8b689278 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -807,6 +807,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -22,7 +22,7 @@ index a20e8910f1a4800708e587853ba9aea5cc0ebce2..fa3c26732778339cd84d53a28c6c938b + if (!org.spigotmc.SpigotConfig.sendNamespaced && suggestions.getRange().getStart() <= 1) { + suggestions.getList().removeIf(suggestion -> suggestion.getText().contains(":")); + } -+ // Paper end ++ // Paper end - Don't tab-complete namespaced commands if send-namespaced is false // Paper start - Brigadier API com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent(this.getCraftPlayer(), suggestions, command); suggestEvent.setCancelled(suggestions.isEmpty()); diff --git a/patches/server/0975-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0973-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 83% rename from patches/server/0975-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0973-Properly-handle-BlockBreakEvent-isDropItems.patch index 275d134d20..e05e39b277 100644 --- a/patches/server/0975-Properly-handle-BlockBreakEvent-isDropItems.patch +++ b/patches/server/0973-Properly-handle-BlockBreakEvent-isDropItems.patch @@ -9,7 +9,7 @@ food consumption, turtle egg count decreases, ice to water conversions and beehive releases diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 82f26186156a487f29ad3abff3f68852e5b8a1f9..3088cf508427ca03804bfa4c081bb6dfcce07d45 100644 +index 82f26186156a487f29ad3abff3f68852e5b8a1f9..932bed293f3eb9ec5aae63235e2907ed96eca189 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -433,8 +433,8 @@ public class ServerPlayerGameMode { @@ -19,12 +19,12 @@ index 82f26186156a487f29ad3abff3f68852e5b8a1f9..3088cf508427ca03804bfa4c081bb6df - if (flag && flag1 && event.isDropItems()) { // CraftBukkit - Check if block should drop items - block.playerDestroy(this.level, this.player, pos, iblockdata1, tileentity, itemstack1); + if (flag && flag1/* && event.isDropItems() */) { // CraftBukkit - Check if block should drop items // Paper - fix drops not preventing stats/food exhaustion -+ block.playerDestroy(this.level, this.player, pos, iblockdata1, tileentity, itemstack1, event.isDropItems(), false); // Paper ++ block.playerDestroy(this.level, this.player, pos, iblockdata1, tileentity, itemstack1, event.isDropItems(), false); // Paper - fix drops not preventing stats/food exhaustion } // return true; // CraftBukkit diff --git a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java -index 6e7a9f68aa3a5084c8eea9fd8721272260734289..2594c8e233114b21e5b00acb5ad7012b004a0ef2 100644 +index 6e7a9f68aa3a5084c8eea9fd8721272260734289..a276e133d1aabcb5b9c1f407fcbee6a84a052f2d 100644 --- a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java @@ -84,8 +84,8 @@ public class BeehiveBlock extends BaseEntityBlock { @@ -33,36 +33,36 @@ index 6e7a9f68aa3a5084c8eea9fd8721272260734289..2594c8e233114b21e5b00acb5ad7012b @Override - public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool) { - super.playerDestroy(world, player, pos, state, blockEntity, tool); -+ public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool, boolean includeDrops, boolean dropExp) { // Paper -+ super.playerDestroy(world, player, pos, state, blockEntity, tool, includeDrops, dropExp); // Paper ++ public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool, boolean includeDrops, boolean dropExp) { // Paper - fix drops not preventing stats/food exhaustion ++ super.playerDestroy(world, player, pos, state, blockEntity, tool, includeDrops, dropExp); // Paper - fix drops not preventing stats/food exhaustion if (!world.isClientSide && blockEntity instanceof BeehiveBlockEntity) { BeehiveBlockEntity tileentitybeehive = (BeehiveBlockEntity) blockEntity; diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index 38d587c93a9ae5706633608f681f18684b7a631d..c450caed1a8d14f3bd56d0336a9bf72a5adca14f 100644 +index 38d587c93a9ae5706633608f681f18684b7a631d..8ac67dd1b06eee08787150abdfc74a8cccec94fc 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -423,10 +423,18 @@ public class Block extends BlockBehaviour implements ItemLike { return this.defaultBlockState(); } -+ @io.papermc.paper.annotation.DoNotUse // Paper - method below allows better control of item drops ++ @io.papermc.paper.annotation.DoNotUse // Paper - fix drops not preventing stats/food exhaustion public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool) { -+ // Paper start ++ // Paper start - fix drops not preventing stats/food exhaustion + this.playerDestroy(world, player, pos, state, blockEntity, tool, true, true); + } + public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool, boolean includeDrops, boolean dropExp) { -+ // Paper end ++ // Paper end - fix drops not preventing stats/food exhaustion player.awardStat(Stats.BLOCK_MINED.get(this)); player.causeFoodExhaustion(0.005F, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.BLOCK_MINED); // CraftBukkit - EntityExhaustionEvent -+ if (includeDrops) { // Paper ++ if (includeDrops) { // Paper - fix drops not preventing stats/food exhaustion Block.dropResources(state, world, pos, blockEntity, player, tool); -+ } // Paper ++ } // Paper - fix drops not preventing stats/food exhaustion } public void setPlacedBy(Level world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) {} diff --git a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java -index 0f0750f8c790d0db72a0e6b277449a1461674890..a6a257027d60bfda8cb975eca7f255fb1bd1e8d5 100644 +index 0f0750f8c790d0db72a0e6b277449a1461674890..03b5ab8251497c0c94467f90e6663a0dc766babb 100644 --- a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java +++ b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java @@ -96,8 +96,8 @@ public class DoublePlantBlock extends BushBlock { @@ -71,13 +71,13 @@ index 0f0750f8c790d0db72a0e6b277449a1461674890..a6a257027d60bfda8cb975eca7f255fb @Override - public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool) { - super.playerDestroy(world, player, pos, Blocks.AIR.defaultBlockState(), blockEntity, tool); -+ public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool, boolean includeDrops, boolean dropExp) { // Paper -+ super.playerDestroy(world, player, pos, Blocks.AIR.defaultBlockState(), blockEntity, tool, includeDrops, dropExp); // Paper ++ public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool, boolean includeDrops, boolean dropExp) { // Paper - fix drops not preventing stats/food exhaustion ++ super.playerDestroy(world, player, pos, Blocks.AIR.defaultBlockState(), blockEntity, tool, includeDrops, dropExp); // Paper - fix drops not preventing stats/food exhaustion } protected static void preventDropFromBottomPart(Level world, BlockPos pos, BlockState state, Player player) { diff --git a/src/main/java/net/minecraft/world/level/block/IceBlock.java b/src/main/java/net/minecraft/world/level/block/IceBlock.java -index f05998e0af1e844f19bf86b74f652a9901088c37..9ebe74e235d425fde985a6180857dc4039ecfedf 100644 +index f05998e0af1e844f19bf86b74f652a9901088c37..19f6e36daed6af02dca3bb88bb81000268264438 100644 --- a/src/main/java/net/minecraft/world/level/block/IceBlock.java +++ b/src/main/java/net/minecraft/world/level/block/IceBlock.java @@ -33,8 +33,8 @@ public class IceBlock extends HalfTransparentBlock { @@ -86,13 +86,13 @@ index f05998e0af1e844f19bf86b74f652a9901088c37..9ebe74e235d425fde985a6180857dc40 @Override - public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool) { - super.playerDestroy(world, player, pos, state, blockEntity, tool); -+ public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool, boolean includeDrops, boolean dropExp) { // Paper -+ super.playerDestroy(world, player, pos, state, blockEntity, tool, includeDrops, dropExp); // Paper ++ public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool, boolean includeDrops, boolean dropExp) { // Paper - fix drops not preventing stats/food exhaustion ++ super.playerDestroy(world, player, pos, state, blockEntity, tool, includeDrops, dropExp); // Paper - fix drops not preventing stats/food exhaustion // Paper start this.afterDestroy(world, pos, tool); } diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -index c79f3a8885a5ffc9ebac51992e63df14929d9f24..5c0127ecbbafd406f450f8707c4563bfea7a0214 100644 +index c79f3a8885a5ffc9ebac51992e63df14929d9f24..b4646e26965e0f1f26c5019e7c6a13fdf22bdb47 100644 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java @@ -173,8 +173,8 @@ public class TurtleEggBlock extends Block { @@ -101,8 +101,8 @@ index c79f3a8885a5ffc9ebac51992e63df14929d9f24..5c0127ecbbafd406f450f8707c4563bf @Override - public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool) { - super.playerDestroy(world, player, pos, state, blockEntity, tool); -+ public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool, boolean includeDrops, boolean dropExp) { // Paper -+ super.playerDestroy(world, player, pos, state, blockEntity, tool, includeDrops, dropExp); // Paper ++ public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack tool, boolean includeDrops, boolean dropExp) { // Paper - fix drops not preventing stats/food exhaustion ++ super.playerDestroy(world, player, pos, state, blockEntity, tool, includeDrops, dropExp); // Paper - fix drops not preventing stats/food exhaustion this.decreaseEggs(world, pos, state); } diff --git a/patches/server/0976-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0974-Fire-entity-death-event-for-ender-dragon.patch similarity index 85% rename from patches/server/0976-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0974-Fire-entity-death-event-for-ender-dragon.patch index 3a071f226e..976d3bd555 100644 --- a/patches/server/0976-Fire-entity-death-event-for-ender-dragon.patch +++ b/patches/server/0974-Fire-entity-death-event-for-ender-dragon.patch @@ -5,21 +5,21 @@ Subject: [PATCH] Fire entity death event for ender dragon diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index 4bcbfe3f95efd5d8ec2d2d7c66c4c355cdf510b2..e5b4aaa9e08dbafa46c92e3fce8b2ee9b0167530 100644 +index 4bcbfe3f95efd5d8ec2d2d7c66c4c355cdf510b2..a59c2d1e84c522a9b86cb86491fb987f6f70dcd0 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -642,6 +642,15 @@ public class EnderDragon extends Mob implements Enemy { @Override public void kill() { -+ // Paper start ++ // Paper start - Fire entity death event + this.silentDeath = true; + org.bukkit.event.entity.EntityDeathEvent deathEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this); + if (deathEvent.isCancelled()) { + this.silentDeath = false; // Reset to default if event was cancelled + return; + } -+ // Paper end ++ // Paper end - Fire entity death event + this.remove(Entity.RemovalReason.KILLED); this.gameEvent(GameEvent.ENTITY_DIE); diff --git a/patches/server/0977-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0975-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 86% rename from patches/server/0977-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0975-Configurable-entity-tracking-range-by-Y-coordinate.patch index 24d83cbe74..39e1032196 100644 --- a/patches/server/0977-Configurable-entity-tracking-range-by-Y-coordinate.patch +++ b/patches/server/0975-Configurable-entity-tracking-range-by-Y-coordinate.patch @@ -6,14 +6,14 @@ Subject: [PATCH] Configurable entity tracking range by Y coordinate Options to configure entity tracking by Y coordinate, also for each entity category. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 4af505a8b6074c49f2d16a6447eeaf038c7804e6..0405bc1e17975a74af3d56edf34354f5cb553a1c 100644 +index 4af505a8b6074c49f2d16a6447eeaf038c7804e6..00a98841d88e8b13501116caa7a03534e1025159 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1419,6 +1419,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider double d1 = vec3d.x * vec3d.x + vec3d.z * vec3d.z; double d2 = d0 * d0; boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z); -+ // Paper start - check Y ++ // Paper start - Configurable entity tracking range by Y + if (flag && level.paperConfig().entities.trackingRangeY.enabled) { + double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1); + if (rangeY != -1) { @@ -21,7 +21,7 @@ index 4af505a8b6074c49f2d16a6447eeaf038c7804e6..0405bc1e17975a74af3d56edf34354f5 + flag = vec3d_dy * vec3d_dy <= rangeY * rangeY; + } + } -+ // Paper end - check Y ++ // Paper end - Configurable entity tracking range by Y // CraftBukkit start - respect vanish API if (!player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { diff --git a/patches/server/0978-Add-Listing-API-for-Player.patch b/patches/server/0976-Add-Listing-API-for-Player.patch similarity index 89% rename from patches/server/0978-Add-Listing-API-for-Player.patch rename to patches/server/0976-Add-Listing-API-for-Player.patch index ae104af868..a054a7938c 100644 --- a/patches/server/0978-Add-Listing-API-for-Player.patch +++ b/patches/server/0976-Add-Listing-API-for-Player.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Add Listing API for Player diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java -index aa1c6de4d6cb7bbca33d25895c54707d220ab62a..9810d62c99f5d7dfca61ddfbbc356aebad2f7001 100644 +index aa1c6de4d6cb7bbca33d25895c54707d220ab62a..0e997dc282ce04dad9a3bc7b01055d8616dc546b 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java @@ -29,12 +29,46 @@ public class ClientboundPlayerInfoUpdatePacket implements Packet actions, List entries) { + this.actions = actions; + this.entries = entries; @@ -22,14 +22,14 @@ index aa1c6de4d6cb7bbca33d25895c54707d220ab62a..9810d62c99f5d7dfca61ddfbbc356aeb + this.actions = actions; + this.entries = List.of(entry); + } -+ // Paper end ++ // Paper end - Add Listing API for Player public static ClientboundPlayerInfoUpdatePacket createPlayerInitializing(Collection players) { EnumSet enumSet = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, ClientboundPlayerInfoUpdatePacket.Action.INITIALIZE_CHAT, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME); return new ClientboundPlayerInfoUpdatePacket(enumSet, players); } -+ // Paper start ++ // Paper start - Add Listing API for Player + public static ClientboundPlayerInfoUpdatePacket createPlayerInitializing(Collection players, ServerPlayer forPlayer) { + final EnumSet enumSet = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, ClientboundPlayerInfoUpdatePacket.Action.INITIALIZE_CHAT, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LATENCY, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME); + final List entries = new java.util.ArrayList<>(players.size()); @@ -50,33 +50,31 @@ index aa1c6de4d6cb7bbca33d25895c54707d220ab62a..9810d62c99f5d7dfca61ddfbbc356aeb + EnumSet enumSet = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LISTED); + return new ClientboundPlayerInfoUpdatePacket(enumSet, new ClientboundPlayerInfoUpdatePacket.Entry(playerInfoId, listed)); + } -+ // Paper end ++ // Paper end - Add Listing API for Player + public ClientboundPlayerInfoUpdatePacket(FriendlyByteBuf buf) { this.actions = buf.readEnumSet(ClientboundPlayerInfoUpdatePacket.Action.class); this.entries = buf.readList((buf2) -> { -@@ -144,8 +178,18 @@ public class ClientboundPlayerInfoUpdatePacket implements Packet onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1); // Paper - use single player info update packet for (int i = 0; i < this.players.size(); ++i) { ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i); if (entityplayer1.getBukkitEntity().canSee(bukkitPlayer)) { -+ // Paper start ++ // Paper start - Add Listing API for Player + if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) { -+ // Paper end ++ // Paper end - Add Listing API for Player entityplayer1.connection.send(packet); -+ // Paper start ++ // Paper start - Add Listing API for Player + } else { + entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false)); + } -+ // Paper end ++ // Paper end - Add Listing API for Player } if (entityplayer1 == player || !bukkitPlayer.canSee(entityplayer1.getBukkitEntity())) { // Paper - don't include joining player @@ -108,19 +106,19 @@ index 683317e8c008fdb501e981490fd62f94597f2fee..e98a455b6bca9d094d0da323bddd7b3f // Paper start - use single player info update packet if (!onlinePlayers.isEmpty()) { - player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers)); -+ player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player)); ++ player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player)); // Paper - Add Listing API for Player } // Paper end player.sentListPacket = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 07312502b4cc95d83e8cadebe7bbc906e01f7f7b..274e001882c0fe1127fc636ea42e3a540edfabbf 100644 +index 07312502b4cc95d83e8cadebe7bbc906e01f7f7b..dfed4f4bf2ca9097aad383f2406de2f635af1031 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -182,6 +182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { private final ConversationTracker conversationTracker = new ConversationTracker(); private final Set channels = new HashSet(); private final Map>> invertedVisibilityEntities = new HashMap<>(); -+ private final Set unlistedEntities = new HashSet<>(); // Paper ++ private final Set unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); private int hash = 0; private double health = 20; @@ -129,7 +127,7 @@ index 07312502b4cc95d83e8cadebe7bbc906e01f7f7b..274e001882c0fe1127fc636ea42e3a54 } // Paper end - this.getHandle().connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(otherPlayer))); -+ this.getHandle().connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(otherPlayer), this.getHandle())); // Paper ++ this.getHandle().connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(otherPlayer), this.getHandle())); // Paper - Add Listing API for Player if (original != null) otherPlayer.setUUID(original); // Paper - uuid override } @@ -137,7 +135,7 @@ index 07312502b4cc95d83e8cadebe7bbc906e01f7f7b..274e001882c0fe1127fc636ea42e3a54 return (entity != null) ? this.canSee(entity) : false; // If we can't find it, we can't see it } -+ // Paper start ++ // Paper start - Add Listing API for Player + @Override + public boolean isListed(Player other) { + return !this.unlistedEntities.contains(other.getUniqueId()); @@ -172,7 +170,7 @@ index 07312502b4cc95d83e8cadebe7bbc906e01f7f7b..274e001882c0fe1127fc636ea42e3a54 + return false; + } + } -+ // Paper end ++ // Paper end - Add Listing API for Player + @Override public Map serialize() { diff --git a/patches/server/0979-Configurable-Region-Compression-Format.patch b/patches/server/0977-Configurable-Region-Compression-Format.patch similarity index 91% rename from patches/server/0979-Configurable-Region-Compression-Format.patch rename to patches/server/0977-Configurable-Region-Compression-Format.patch index 08de696dde..d5e8d8849c 100644 --- a/patches/server/0979-Configurable-Region-Compression-Format.patch +++ b/patches/server/0977-Configurable-Region-Compression-Format.patch @@ -23,7 +23,7 @@ index 84b2fd9db39e0cdf3e1cbe6444579f7ca839bc45..9248769e6d357f6eec68945fd7700e79 // Paper end - add can recalc flag diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java -index 4411e427d3b6b592f8a18e61b6c59309cf699d3f..ee27a553b426d3e1e1317bbeb39a3c2d46520e59 100644 +index 4411e427d3b6b592f8a18e61b6c59309cf699d3f..6210a202d27788b1304e749b5bc2d9e2b88f5a63 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java @@ -30,6 +30,17 @@ public class RegionFileVersion { @@ -31,7 +31,7 @@ index 4411e427d3b6b592f8a18e61b6c59309cf699d3f..ee27a553b426d3e1e1317bbeb39a3c2d return stream; })); + -+ // Paper Start - Configurable region compression format ++ // Paper start - Configurable region compression format + public static RegionFileVersion getCompressionFormat() { + return switch (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.compressionFormat) { + case GZIP -> VERSION_GZIP; @@ -39,7 +39,7 @@ index 4411e427d3b6b592f8a18e61b6c59309cf699d3f..ee27a553b426d3e1e1317bbeb39a3c2d + case NONE -> VERSION_NONE; + }; + } -+ // Paper End ++ // Paper end - Configurable region compression format + private final int id; private final RegionFileVersion.StreamWrapper inputWrapper; diff --git a/patches/server/0980-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0978-Add-BlockFace-to-BlockDamageEvent.patch similarity index 84% rename from patches/server/0980-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/server/0978-Add-BlockFace-to-BlockDamageEvent.patch index f2d86a7eed..cf0ff66fb9 100644 --- a/patches/server/0980-Expose-clicked-BlockFace-during-BlockDamageEvent.patch +++ b/patches/server/0978-Add-BlockFace-to-BlockDamageEvent.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: aerulion Date: Mon, 21 Aug 2023 04:36:07 +0200 -Subject: [PATCH] Expose clicked BlockFace during BlockDamageEvent +Subject: [PATCH] Add BlockFace to BlockDamageEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 3088cf508427ca03804bfa4c081bb6dfcce07d45..cc1c077c3e91d1f8852fcd6ea939864cfce398a8 100644 +index 932bed293f3eb9ec5aae63235e2907ed96eca189..16cb80c64ebf33b9621fdbd6655becb85db487fa 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -253,7 +253,7 @@ public class ServerPlayerGameMode { @@ -13,12 +13,12 @@ index 3088cf508427ca03804bfa4c081bb6dfcce07d45..cc1c077c3e91d1f8852fcd6ea939864c return; } - org.bukkit.event.block.BlockDamageEvent blockEvent = CraftEventFactory.callBlockDamageEvent(this.player, pos, this.player.getInventory().getSelected(), f >= 1.0f); -+ org.bukkit.event.block.BlockDamageEvent blockEvent = CraftEventFactory.callBlockDamageEvent(this.player, pos, direction, this.player.getInventory().getSelected(), f >= 1.0f); // Paper - Expose BlockFace ++ org.bukkit.event.block.BlockDamageEvent blockEvent = CraftEventFactory.callBlockDamageEvent(this.player, pos, direction, this.player.getInventory().getSelected(), f >= 1.0f); // Paper - Add BlockFace to BlockDamageEvent if (blockEvent.isCancelled()) { // Let the client know the block still exists diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2299cff413241aa97e9f498eb0dea51575e364ae..9e204e066550a47b3b670b6b60b7cb4421812d3f 100644 +index 7fe4d29f7734ba9642f1a64c161df7d24b88a18a..acaa575e70261c188fa1728919ee493f0ea53502 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -649,13 +649,13 @@ public class CraftEventFactory { @@ -26,14 +26,14 @@ index 2299cff413241aa97e9f498eb0dea51575e364ae..9e204e066550a47b3b670b6b60b7cb44 * BlockDamageEvent */ - public static BlockDamageEvent callBlockDamageEvent(ServerPlayer who, BlockPos pos, ItemStack itemstack, boolean instaBreak) { -+ public static BlockDamageEvent callBlockDamageEvent(ServerPlayer who, BlockPos pos, Direction direction, ItemStack itemstack, boolean instaBreak) { // Paper - Expose BlockFace ++ public static BlockDamageEvent callBlockDamageEvent(ServerPlayer who, BlockPos pos, Direction direction, ItemStack itemstack, boolean instaBreak) { // Paper - Add BlockFace to BlockDamageEvent Player player = who.getBukkitEntity(); CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack); Block blockClicked = CraftBlock.at(who.level(), pos); - BlockDamageEvent event = new BlockDamageEvent(player, blockClicked, itemInHand, instaBreak); -+ BlockDamageEvent event = new BlockDamageEvent(player, blockClicked, CraftBlock.notchToBlockFace(direction), itemInHand, instaBreak); // Paper - Expose BlockFace ++ BlockDamageEvent event = new BlockDamageEvent(player, blockClicked, CraftBlock.notchToBlockFace(direction), itemInHand, instaBreak); // Paper - Add BlockFace to BlockDamageEvent player.getServer().getPluginManager().callEvent(event); return event; diff --git a/patches/server/0981-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0979-Fix-NPE-on-Boat-getStatus.patch similarity index 87% rename from patches/server/0981-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0979-Fix-NPE-on-Boat-getStatus.patch index f2b53faa13..060e44340f 100644 --- a/patches/server/0981-Fix-NPE-on-Boat-getStatus.patch +++ b/patches/server/0979-Fix-NPE-on-Boat-getStatus.patch @@ -9,14 +9,14 @@ Boat status is null until the entity is added to the world and the tick() method public net.minecraft.world.entity.vehicle.Boat getStatus()Lnet/minecraft/world/entity/vehicle/Boat$Status; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java -index d161cbf9c83cd78593864850b98f688da2c85aa5..859f233197ebe738511011e36668c4eb5d4b7d8e 100644 +index d161cbf9c83cd78593864850b98f688da2c85aa5..8184a2adf889e02b048ceb015edfc04d1b5c21b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java @@ -88,6 +88,17 @@ public class CraftBoat extends CraftVehicle implements Boat { @Override public Status getStatus() { -+ // Paper start ++ // Paper start - Fix NPE on Boat getStatus + final net.minecraft.world.entity.vehicle.Boat handle = this.getHandle(); + if (handle.status == null) { + if (handle.valid && !handle.updatingSectionStatus) { @@ -26,7 +26,7 @@ index d161cbf9c83cd78593864850b98f688da2c85aa5..859f233197ebe738511011e36668c4eb + return Status.NOT_IN_WORLD; + } + } -+ // Paper end ++ // Paper end - Fix NPE on Boat getStatus return CraftBoat.boatStatusFromNms(this.getHandle().status); } diff --git a/patches/server/0982-Expand-Pose-API.patch b/patches/server/0980-Expand-Pose-API.patch similarity index 90% rename from patches/server/0982-Expand-Pose-API.patch rename to patches/server/0980-Expand-Pose-API.patch index 1acea775aa..e4fe784fba 100644 --- a/patches/server/0982-Expand-Pose-API.patch +++ b/patches/server/0980-Expand-Pose-API.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 687f7358466302195ec564ca5c817b13d2ce3f16..a152716a0dedc39d6d606476d8e3ba542f773d56 100644 +index 687f7358466302195ec564ca5c817b13d2ce3f16..ec6a75e266725ce9de09f44cb7ed4096cf23a211 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -423,6 +423,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @javax.annotation.Nullable private UUID originWorld; public boolean freezeLocked = false; // Paper - Freeze Tick Lock API -+ public boolean fixedPose = false; // Paper ++ public boolean fixedPose = false; // Paper - Expand Pose API public void setOrigin(@javax.annotation.Nonnull Location location) { this.origin = location.toVector(); @@ -20,7 +20,7 @@ index 687f7358466302195ec564ca5c817b13d2ce3f16..a152716a0dedc39d6d606476d8e3ba54 public void onClientRemoval() {} public void setPose(net.minecraft.world.entity.Pose pose) { -+ if (this.fixedPose) return; // Paper ++ if (this.fixedPose) return; // Paper - Expand Pose API // CraftBukkit start if (pose == this.getPose()) { return; diff --git a/patches/server/0983-More-DragonBattle-API.patch b/patches/server/0981-More-DragonBattle-API.patch similarity index 91% rename from patches/server/0983-More-DragonBattle-API.patch rename to patches/server/0981-More-DragonBattle-API.patch index d14bf53224..ccbfe560ab 100644 --- a/patches/server/0983-More-DragonBattle-API.patch +++ b/patches/server/0981-More-DragonBattle-API.patch @@ -10,14 +10,14 @@ public net.minecraft.world.level.dimension.end.EndDragonFight respawnCrystals public net.minecraft.world.level.dimension.end.EndDragonFight spawnNewGateway(Lnet/minecraft/core/BlockPos;)V diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java -index 390542c42fe957e8e2d21c879c1c8908c8970b44..b2a57cb75916d2724f18779c922005ef9bcc0b0e 100644 +index 390542c42fe957e8e2d21c879c1c8908c8970b44..36b0912fa2fd64b83a163112df478e67408e089b 100644 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java @@ -439,6 +439,24 @@ public class EndDragonFight { this.gateways.clear(); } -+ // Paper start ++ // Paper start - More DragonBattle API + public boolean spawnNewGatewayIfPossible() { + if (!this.gateways.isEmpty()) { + this.spawnNewGateway(); @@ -33,20 +33,20 @@ index 390542c42fe957e8e2d21c879c1c8908c8970b44..b2a57cb75916d2724f18779c922005ef + } + return endCrystals; + } -+ // Paper end ++ // Paper end - More DragonBattle API + private void spawnNewGateway() { if (!this.gateways.isEmpty()) { int i = (Integer) this.gateways.remove(this.gateways.size() - 1); diff --git a/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java b/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java -index 58f1562373bab8d082172e4a5db22493fb913ca8..716327137c3528a74871d2aad4849812d7113d22 100644 +index 58f1562373bab8d082172e4a5db22493fb913ca8..cd5c59ed59eedf233f31415bb949fcf5ae2bd49f 100644 --- a/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java +++ b/src/main/java/org/bukkit/craftbukkit/boss/CraftDragonBattle.java @@ -132,4 +132,46 @@ public class CraftDragonBattle implements DragonBattle { private DragonRespawnAnimation toNMSRespawnPhase(RespawnPhase phase) { return (phase != RespawnPhase.NONE) ? DragonRespawnAnimation.values()[phase.ordinal()] : null; } -+ // Paper start ++ // Paper start - More DragonBattle API + @Override + public int getGatewayCount() { + return EndDragonFight.GATEWAY_COUNT - this.handle.gateways.size(); @@ -87,5 +87,5 @@ index 58f1562373bab8d082172e4a5db22493fb913ca8..716327137c3528a74871d2aad4849812 + } + return java.util.Collections.unmodifiableList(enderCrystals); + } -+ // Paper end ++ // Paper end - More DragonBattle API } diff --git a/patches/server/0984-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0982-Deep-clone-unhandled-nbt-tags.patch similarity index 93% rename from patches/server/0984-Deep-clone-unhandled-nbt-tags.patch rename to patches/server/0982-Deep-clone-unhandled-nbt-tags.patch index d08974665d..f9f9e518d8 100644 --- a/patches/server/0984-Deep-clone-unhandled-nbt-tags.patch +++ b/patches/server/0982-Deep-clone-unhandled-nbt-tags.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Deep clone unhandled nbt tags diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index b7c0c9a40dac3e828f880ef928ca34206a898cb9..ba2da16e1e17d9544535511939302da633e8ebcc 100644 +index b7c0c9a40dac3e828f880ef928ca34206a898cb9..baf31c109ee8b5e59acd7ff5fc537ea46f27d164 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -305,7 +305,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @@ -13,7 +13,7 @@ index b7c0c9a40dac3e828f880ef928ca34206a898cb9..ba2da16e1e17d9544535511939302da6 private CompoundTag internalTag; - final Map unhandledTags = new TreeMap(); // Visible for testing only // Paper -+ Map unhandledTags = new TreeMap(); // Visible for testing only // Paper // Paper - remove final ++ Map unhandledTags = new TreeMap(); // Visible for testing only // Paper // Paper - Deep clone unhandled nbt tags; remove final private CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftMetaItem.DATA_TYPE_REGISTRY); private int version = CraftMagicNumbers.INSTANCE.getDataVersion(); // Internal use only @@ -26,7 +26,7 @@ index b7c0c9a40dac3e828f880ef928ca34206a898cb9..ba2da16e1e17d9544535511939302da6 + // Paper start - Deep clone unhandled nbt tags + meta.unhandledTags.forEach((key, tag) -> this.unhandledTags.put(key, tag.copy())); + this.persistentDataContainer.putAll(meta.persistentDataContainer.getTagsCloned()); -+ // Paper end ++ // Paper end - Deep clone unhandled nbt tags this.internalTag = meta.internalTag; if (this.internalTag != null) { diff --git a/patches/server/0985-Add-PlayerPickItemEvent.patch b/patches/server/0983-Add-PlayerPickItemEvent.patch similarity index 83% rename from patches/server/0985-Add-PlayerPickItemEvent.patch rename to patches/server/0983-Add-PlayerPickItemEvent.patch index 15241752ef..a7c9b6c5dd 100644 --- a/patches/server/0985-Add-PlayerPickItemEvent.patch +++ b/patches/server/0983-Add-PlayerPickItemEvent.patch @@ -5,14 +5,16 @@ Subject: [PATCH] Add PlayerPickItemEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fa3c26732778339cd84d53a28c6c938b50594f0f..e04ba1e0949e3fa237ea002c37229f5cb03275cb 100644 +index 4f511fd74abe7a666fd12a514d65846f8b689278..b613bacfbc6f04b908db85aafaba45a170a0a0f1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -944,7 +944,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -944,8 +944,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.disconnect("Invalid hotbar selection (Hacking?)", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause return; } - this.player.getInventory().pickSlot(packet.getSlot()); // Paper - Diff above if changed + // Paper end ++ // Paper start - Add PlayerPickItemEvent + Player bukkitPlayer = this.player.getBukkitEntity(); + int targetSlot = this.player.getInventory().getSuitableHotbarSlot(); + int sourceSlot = packet.getSlot(); @@ -21,11 +23,12 @@ index fa3c26732778339cd84d53a28c6c938b50594f0f..e04ba1e0949e3fa237ea002c37229f5c + if (!event.callEvent()) return; + + this.player.getInventory().pickSlot(event.getSourceSlot(), event.getTargetSlot()); - // Paper end ++ // Paper end - Add PlayerPickItemEvent this.player.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, this.player.getInventory().selected, this.player.getInventory().getItem(this.player.getInventory().selected))); this.player.connection.send(new ClientboundContainerSetSlotPacket(-2, 0, packet.getSlot(), this.player.getInventory().getItem(packet.getSlot()))); + this.player.connection.send(new ClientboundSetCarriedItemPacket(this.player.getInventory().selected)); diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java -index 395cecc385e4126a7534ac9aeb15cf323efab03e..96d664c28738d6090f7067761c2978dd1aa0fd0e 100644 +index 395cecc385e4126a7534ac9aeb15cf323efab03e..309acf7bd07e38043aa81e0e686edba1136bd04c 100644 --- a/src/main/java/net/minecraft/world/entity/player/Inventory.java +++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java @@ -174,7 +174,13 @@ public class Inventory implements Container, Nameable { @@ -39,7 +42,7 @@ index 395cecc385e4126a7534ac9aeb15cf323efab03e..96d664c28738d6090f7067761c2978dd + + public void pickSlot(int slot, int targetSlot) { + this.selected = targetSlot; -+ // Paper end ++ // Paper end - Add PlayerPickItemEvent ItemStack itemstack = (ItemStack) this.items.get(this.selected); this.items.set(this.selected, (ItemStack) this.items.get(slot)); diff --git a/patches/server/0986-Improve-performance-of-mass-crafts.patch b/patches/server/0984-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/0986-Improve-performance-of-mass-crafts.patch rename to patches/server/0984-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/0987-Allow-trident-custom-damage.patch b/patches/server/0985-Allow-trident-custom-damage.patch similarity index 57% rename from patches/server/0987-Allow-trident-custom-damage.patch rename to patches/server/0985-Allow-trident-custom-damage.patch index 3b1f6db132..6e500d2b28 100644 --- a/patches/server/0987-Allow-trident-custom-damage.patch +++ b/patches/server/0985-Allow-trident-custom-damage.patch @@ -4,33 +4,20 @@ Date: Tue, 12 Jul 2022 18:01:14 +0200 Subject: [PATCH] Allow trident custom damage -diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 6272b0e1e332789b983a486ee25226e2a1c9fdda..42ebd91196ae420eee57f4380abc558555457163 100644 ---- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -66,7 +66,7 @@ public abstract class AbstractArrow extends Projectile { - public AbstractArrow.Pickup pickup; - public int shakeTime; - public int life; -- private double baseDamage; -+ protected double baseDamage; // Paper - private -> protected - public int knockback; - public SoundEvent soundEvent; - @Nullable diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java -index cbe8593cecd84f1598649801bebcb46364044eef..01e8f6f36a17c484b825879c377f7d6cc08e1fda 100644 +index cbe8593cecd84f1598649801bebcb46364044eef..51931e5cecf4c9ed8442136b18a94c7da89cf77d 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java @@ -34,10 +34,12 @@ public class ThrownTrident extends AbstractArrow { public ThrownTrident(EntityType type, Level world) { super(type, world, ThrownTrident.DEFAULT_ARROW_STACK); -+ this.baseDamage = net.minecraft.world.item.TridentItem.BASE_DAMAGE; // Paper ++ this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage } public ThrownTrident(Level world, LivingEntity owner, ItemStack stack) { super(EntityType.TRIDENT, owner, world, stack); -+ this.baseDamage = net.minecraft.world.item.TridentItem.BASE_DAMAGE; // Paper ++ this.setBaseDamage(net.minecraft.world.item.TridentItem.BASE_DAMAGE); // Paper - Allow trident custom damage this.entityData.set(ThrownTrident.ID_LOYALTY, (byte) EnchantmentHelper.getLoyalty(stack)); this.entityData.set(ThrownTrident.ID_FOIL, stack.hasFoil()); } @@ -39,7 +26,7 @@ index cbe8593cecd84f1598649801bebcb46364044eef..01e8f6f36a17c484b825879c377f7d6c protected void onHitEntity(EntityHitResult entityHitResult) { Entity entity = entityHitResult.getEntity(); - float f = 8.0F; -+ float f = (float) this.baseDamage; // Paper ++ float f = (float) this.getBaseDamage(); // Paper - Allow trident custom damage if (entity instanceof LivingEntity) { LivingEntity entityliving = (LivingEntity) entity; diff --git a/patches/server/0988-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/0986-Expose-hand-in-BlockCanBuildEvent.patch similarity index 87% rename from patches/server/0988-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/server/0986-Expose-hand-in-BlockCanBuildEvent.patch index dc68b12fb2..82904d45d2 100644 --- a/patches/server/0988-Expose-hand-during-BlockCanBuildEvent.patch +++ b/patches/server/0986-Expose-hand-in-BlockCanBuildEvent.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: The456gamer Date: Mon, 21 Aug 2023 14:13:42 +0100 -Subject: [PATCH] Expose hand during BlockCanBuildEvent +Subject: [PATCH] Expose hand in BlockCanBuildEvent diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java -index 6819cea2858f0035a4fbf3671612d43fead883b6..ce0a22b5084cb382b7c1036960793e3a8314a26f 100644 +index 6819cea2858f0035a4fbf3671612d43fead883b6..de632c93817f1214c9c4cafc841dd9e07c624ec9 100644 --- a/src/main/java/net/minecraft/world/item/BlockItem.java +++ b/src/main/java/net/minecraft/world/item/BlockItem.java @@ -214,7 +214,7 @@ public class BlockItem extends Item { @@ -13,12 +13,12 @@ index 6819cea2858f0035a4fbf3671612d43fead883b6..ce0a22b5084cb382b7c1036960793e3a org.bukkit.entity.Player player = (context.getPlayer() instanceof ServerPlayer) ? (org.bukkit.entity.Player) context.getPlayer().getBukkitEntity() : null; - BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn); -+ BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - expose hand ++ BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - Expose hand in BlockCanBuildEvent context.getLevel().getCraftServer().getPluginManager().callEvent(event); return event.isBuildable(); diff --git a/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java b/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java -index 39b8b3675ac58409e05fac07e07c8016c5280d81..88072259a9de205db428351c5c9f6114e199e402 100644 +index 39b8b3675ac58409e05fac07e07c8016c5280d81..f8f909ebdad5e96379e8bd8c610164ef0697368e 100644 --- a/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java +++ b/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java @@ -59,7 +59,7 @@ public class StandingAndWallBlockItem extends BlockItem { @@ -26,7 +26,7 @@ index 39b8b3675ac58409e05fac07e07c8016c5280d81..88072259a9de205db428351c5c9f6114 org.bukkit.entity.Player player = (context.getPlayer() instanceof ServerPlayer) ? (org.bukkit.entity.Player) context.getPlayer().getBukkitEntity() : null; - BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(world, blockposition), player, CraftBlockData.fromData(iblockdata1), defaultReturn); -+ BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(world, blockposition), player, CraftBlockData.fromData(iblockdata1), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - expose hand ++ BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(world, blockposition), player, CraftBlockData.fromData(iblockdata1), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - Expose hand in BlockCanBuildEvent context.getLevel().getCraftServer().getPluginManager().callEvent(event); return (event.isBuildable()) ? iblockdata1 : null; diff --git a/patches/server/0989-Optimize-nearest-structure-border-iteration.patch b/patches/server/0987-Optimize-nearest-structure-border-iteration.patch similarity index 91% rename from patches/server/0989-Optimize-nearest-structure-border-iteration.patch rename to patches/server/0987-Optimize-nearest-structure-border-iteration.patch index a817c71823..9cae3f6ba9 100644 --- a/patches/server/0989-Optimize-nearest-structure-border-iteration.patch +++ b/patches/server/0987-Optimize-nearest-structure-border-iteration.patch @@ -14,7 +14,7 @@ ensure that the returned found structure (which may for example be a buried treasure that will be marked on a treasure map) is the same as in vanilla. diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java -index e9239f90e59d1429fc7a2618e0fd3b8a57633b87..0708aaa7d25c674ab2ce431a262fed2459fd633d 100644 +index e9239f90e59d1429fc7a2618e0fd3b8a57633b87..59ba71da7f679e53aab2a84cb991b77d1abf6578 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -260,12 +260,15 @@ public abstract class ChunkGenerator { @@ -33,7 +33,7 @@ index e9239f90e59d1429fc7a2618e0fd3b8a57633b87..0708aaa7d25c674ab2ce431a262fed24 - if (flag1 || flag2) { + // if (flag1 || flag2) { + if (true) { -+ // Paper end ++ // Paper end - iterate over border chunks instead of entire square chunk area int l1 = centerChunkX + i1 * j1; int i2 = centerChunkZ + i1 * k1; ChunkPos chunkcoordintpair = placement.getPotentialStructureChunk(seed, l1, i2); diff --git a/patches/server/0990-Implement-OfflinePlayer-isConnected.patch b/patches/server/0988-Implement-OfflinePlayer-isConnected.patch similarity index 94% rename from patches/server/0990-Implement-OfflinePlayer-isConnected.patch rename to patches/server/0988-Implement-OfflinePlayer-isConnected.patch index b69e2d1858..aac77cd383 100644 --- a/patches/server/0990-Implement-OfflinePlayer-isConnected.patch +++ b/patches/server/0988-Implement-OfflinePlayer-isConnected.patch @@ -23,7 +23,7 @@ index 9daec0782774ab51ea8091cb8ed9d0a106e34cfa..2bbc39c257965ad91ee360cdfcd3538a public String getName() { Player player = this.getPlayer(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 274e001882c0fe1127fc636ea42e3a540edfabbf..3507696d2b83b09b781ac0e6f3eefd6eed632ab4 100644 +index dfed4f4bf2ca9097aad383f2406de2f635af1031..0eaa7d410ef93713f59d0cfb3cf4112a004e886c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -279,6 +279,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0991-Fix-inventory-desync.patch b/patches/server/0989-Fix-inventory-desync.patch similarity index 91% rename from patches/server/0991-Fix-inventory-desync.patch rename to patches/server/0989-Fix-inventory-desync.patch index 6da7d78b43..e92e350ff5 100644 --- a/patches/server/0991-Fix-inventory-desync.patch +++ b/patches/server/0989-Fix-inventory-desync.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix inventory desync diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java -index ce0a22b5084cb382b7c1036960793e3a8314a26f..efdf56044396b4ce486948d2c993971f99174a5e 100644 +index de632c93817f1214c9c4cafc841dd9e07c624ec9..aa8fc03d620a079b650decfec409ba4d58a83fa6 100644 --- a/src/main/java/net/minecraft/world/item/BlockItem.java +++ b/src/main/java/net/minecraft/world/item/BlockItem.java @@ -116,7 +116,7 @@ public class BlockItem extends Item { diff --git a/patches/server/0992-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0990-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 85% rename from patches/server/0992-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/0990-Add-titleOverride-to-InventoryOpenEvent.patch index 0ec6f17594..23dcf85fc5 100644 --- a/patches/server/0992-Add-titleOverride-to-InventoryOpenEvent.patch +++ b/patches/server/0990-Add-titleOverride-to-InventoryOpenEvent.patch @@ -5,25 +5,25 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 42c42d599d5b4827693cfe3f6cf9a32e67f2e16c..7f370d7f6e576ef719e69734dd81ec950a1f5022 100644 +index 42c42d599d5b4827693cfe3f6cf9a32e67f2e16c..2eb320dc136712aac3896a5aacf8800dc2c121ba 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1573,12 +1573,17 @@ public class ServerPlayer extends Player { this.nextContainerCounter(); AbstractContainerMenu container = factory.createMenu(this.containerCounter, this.getInventory(), this); -+ Component title = null; // Paper ++ Component title = null; // Paper - Add titleOverride to InventoryOpenEvent // CraftBukkit start - Inventory open hook if (container != null) { container.setTitle(factory.getDisplayName()); boolean cancelled = false; - container = CraftEventFactory.callInventoryOpenEvent(this, container, cancelled); -+ // Paper start ++ // Paper start - Add titleOverride to InventoryOpenEvent + final com.mojang.datafixers.util.Pair result = CraftEventFactory.callInventoryOpenEventWithTitle(this, container, cancelled); + container = result.getSecond(); + title = PaperAdventure.asVanilla(result.getFirst()); -+ // Paper end ++ // Paper end - Add titleOverride to InventoryOpenEvent if (container == null && !cancelled) { // Let pre-cancelled events fall through // SPIGOT-5263 - close chest if cancelled if (factory instanceof Container) { @@ -32,12 +32,12 @@ index 42c42d599d5b4827693cfe3f6cf9a32e67f2e16c..7f370d7f6e576ef719e69734dd81ec95 // CraftBukkit start this.containerMenu = container; - if (!this.isImmobile()) this.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(), container.getTitle())); // Paper -+ if (!this.isImmobile()) this.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(), Objects.requireNonNullElseGet(title, container::getTitle))); // Paper ++ if (!this.isImmobile()) this.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(), Objects.requireNonNullElseGet(title, container::getTitle))); // Paper - Add titleOverride to InventoryOpenEvent // CraftBukkit end this.initMenu(container); return OptionalInt.of(this.containerCounter); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 52c9244194f3c0182f3a6010ed97d4238efd4eb4..b9fa739f03b33da7d20cf6430321da64690ec4f3 100644 +index 52c9244194f3c0182f3a6010ed97d4238efd4eb4..16fc8c502ffce94d4fb50119e36a21d847408f03 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -357,12 +357,16 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -45,16 +45,16 @@ index 52c9244194f3c0182f3a6010ed97d4238efd4eb4..b9fa739f03b33da7d20cf6430321da64 AbstractContainerMenu container = new CraftContainer(inventory, player, player.nextContainerCounter()); - container = CraftEventFactory.callInventoryOpenEvent(player, container); -+ // Paper start ++ // Paper start - Add titleOverride to InventoryOpenEvent + final com.mojang.datafixers.util.Pair result = CraftEventFactory.callInventoryOpenEventWithTitle(player, container); + container = result.getSecond(); -+ // Paper end ++ // Paper end - Add titleOverride to InventoryOpenEvent if (container == null) return; //String title = container.getBukkitView().getTitle(); // Paper - comment net.kyori.adventure.text.Component adventure$title = container.getBukkitView().title(); // Paper if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(container.getBukkitView().getTitle()); // Paper -+ if (result.getFirst() != null) adventure$title = result.getFirst(); // Paper ++ if (result.getFirst() != null) adventure$title = result.getFirst(); // Paper - Add titleOverride to InventoryOpenEvent //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper @@ -63,10 +63,10 @@ index 52c9244194f3c0182f3a6010ed97d4238efd4eb4..b9fa739f03b33da7d20cf6430321da64 // Trigger an INVENTORY_OPEN event - container = CraftEventFactory.callInventoryOpenEvent(player, container); -+ // Paper start ++ // Paper start - Add titleOverride to InventoryOpenEvent + final com.mojang.datafixers.util.Pair result = CraftEventFactory.callInventoryOpenEventWithTitle(player, container); + container = result.getSecond(); -+ // Paper end ++ // Paper end - Add titleOverride to InventoryOpenEvent if (container == null) { return; } @@ -74,12 +74,12 @@ index 52c9244194f3c0182f3a6010ed97d4238efd4eb4..b9fa739f03b33da7d20cf6430321da64 //String title = inventory.getTitle(); // Paper - comment net.kyori.adventure.text.Component adventure$title = inventory.title(); // Paper if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(inventory.getTitle()); // Paper -+ if (result.getFirst() != null) adventure$title = result.getFirst(); // Paper ++ if (result.getFirst() != null) adventure$title = result.getFirst(); // Paper - Add titleOverride to InventoryOpenEvent //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper player.containerMenu = container; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 9e204e066550a47b3b670b6b60b7cb4421812d3f..93bf055d1b050c58677e8cec39e95b53b879ec1d 100644 +index acaa575e70261c188fa1728919ee493f0ea53502..e42c87a38787e3528dd663627da9c4286e1d8bfc 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1440,10 +1440,21 @@ public class CraftEventFactory { @@ -87,21 +87,21 @@ index 9e204e066550a47b3b670b6b60b7cb4421812d3f..93bf055d1b050c58677e8cec39e95b53 public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container) { - return CraftEventFactory.callInventoryOpenEvent(player, container, false); -+ // Paper start ++ // Paper start - Add titleOverride to InventoryOpenEvent + return callInventoryOpenEventWithTitle(player, container).getSecond(); + } + public static com.mojang.datafixers.util.Pair callInventoryOpenEventWithTitle(ServerPlayer player, AbstractContainerMenu container) { + return CraftEventFactory.callInventoryOpenEventWithTitle(player, container, false); -+ // Paper end ++ // Paper end - Add titleOverride to InventoryOpenEvent } + @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper - use method that acknowledges title overrides public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) { -+ // Paper start ++ // Paper start - Add titleOverride to InventoryOpenEvent + return callInventoryOpenEventWithTitle(player, container, cancelled).getSecond(); + } + public static com.mojang.datafixers.util.Pair callInventoryOpenEventWithTitle(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) { -+ // Paper end ++ // Paper end - Add titleOverride to InventoryOpenEvent if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId), InventoryCloseEvent.Reason.OPEN_NEW); // Paper } @@ -110,11 +110,11 @@ index 9e204e066550a47b3b670b6b60b7cb4421812d3f..93bf055d1b050c58677e8cec39e95b53 if (event.isCancelled()) { container.transferTo(player.containerMenu, craftPlayer); - return null; -+ return com.mojang.datafixers.util.Pair.of(null, null); // Paper - title override ++ return com.mojang.datafixers.util.Pair.of(null, null); // Paper - Add titleOverride to InventoryOpenEvent } - return container; -+ return com.mojang.datafixers.util.Pair.of(event.titleOverride(), container); // Paper - title override ++ return com.mojang.datafixers.util.Pair.of(event.titleOverride(), container); // Paper - Add titleOverride to InventoryOpenEvent } public static ItemStack callPreCraftEvent(Container matrix, Container resultInventory, ItemStack result, InventoryView lastCraftView, boolean isRepair) { diff --git a/patches/server/0993-Configure-sniffer-egg-hatch-time.patch b/patches/server/0991-Configure-sniffer-egg-hatch-time.patch similarity index 91% rename from patches/server/0993-Configure-sniffer-egg-hatch-time.patch rename to patches/server/0991-Configure-sniffer-egg-hatch-time.patch index 4b20794de9..dd9b57737f 100644 --- a/patches/server/0993-Configure-sniffer-egg-hatch-time.patch +++ b/patches/server/0991-Configure-sniffer-egg-hatch-time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configure sniffer egg hatch time diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java -index 02939518ead6463e677ecf5b045ec89aae154e8c..cb431b6027019ca95879129e88967ee6ae03c313 100644 +index 02939518ead6463e677ecf5b045ec89aae154e8c..a18b85769d5d46efa43b0cd2face958b3250571a 100644 --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java @@ -63,7 +63,7 @@ public class SnifferEggBlock extends Block { @@ -13,7 +13,7 @@ index 02939518ead6463e677ecf5b045ec89aae154e8c..cb431b6027019ca95879129e88967ee6 // Paper start private void rescheduleTick(ServerLevel world, BlockPos pos) { - int baseDelay = hatchBoost(world, pos) ? BOOSTED_HATCH_TIME_TICKS : REGULAR_HATCH_TIME_TICKS; -+ int baseDelay = hatchBoost(world, pos) ? world.paperConfig().entities.sniffer.boostedHatchTime.or(BOOSTED_HATCH_TIME_TICKS) : world.paperConfig().entities.sniffer.hatchTime.or(REGULAR_HATCH_TIME_TICKS); ++ int baseDelay = hatchBoost(world, pos) ? world.paperConfig().entities.sniffer.boostedHatchTime.or(BOOSTED_HATCH_TIME_TICKS) : world.paperConfig().entities.sniffer.hatchTime.or(REGULAR_HATCH_TIME_TICKS); // Paper - Configure sniffer egg hatch time world.scheduleTick(pos, this, (baseDelay / 3) + world.random.nextInt(RANDOM_HATCH_OFFSET_TICKS)); // reschedule to avoid being stuck here and behave like the other calls (see #onPlace) } diff --git a/patches/server/0994-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0992-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 85% rename from patches/server/0994-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/0992-Do-crystal-portal-proximity-check-before-entity-look.patch index 0244f274f5..2ae71ff137 100644 --- a/patches/server/0994-Do-crystal-portal-proximity-check-before-entity-look.patch +++ b/patches/server/0992-Do-crystal-portal-proximity-check-before-entity-look.patch @@ -12,7 +12,7 @@ some servers that have players placing end crystals as a style of combat. The very cheap distance check prevents running the entity lookup every time. diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java -index ca1edc083847b47bb450b291723aca778a5912dc..5a19875cbc603acea95193d969d2e1dc1e0bfd78 100644 +index ca1edc083847b47bb450b291723aca778a5912dc..e1696f6b77df4c8fceaece64701d4db78b0a4c42 100644 --- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java +++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java @@ -29,7 +29,7 @@ public class EndCrystalItem extends Item { @@ -29,24 +29,24 @@ index ca1edc083847b47bb450b291723aca778a5912dc..5a19875cbc603acea95193d969d2e1dc if (enderdragonbattle != null) { - enderdragonbattle.tryRespawn(); -+ enderdragonbattle.tryRespawn(aboveBlockPosition); // Paper - pass placed end crystal position to pre-check proximity to portal ++ enderdragonbattle.tryRespawn(aboveBlockPosition); // Paper - Perf: Do crystal-portal proximity check before entity lookup } } diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java -index b2a57cb75916d2724f18779c922005ef9bcc0b0e..c1ff2e15bc5da1a642872ac0fdcdc457e8abb063 100644 +index 36b0912fa2fd64b83a163112df478e67408e089b..e1604fd1fb5f779b5fb96f98c94918e4db88918a 100644 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java @@ -558,6 +558,12 @@ public class EndDragonFight { } public boolean tryRespawn() { // CraftBukkit - return boolean -+ // Paper start - pass null (indicating no placed end crystal involved) by default ++ // Paper start - Perf: Do crystal-portal proximity check before entity lookup + return this.tryRespawn(null); + } + + public boolean tryRespawn(@Nullable BlockPos placedEndCrystalPos) { // placedEndCrystalPos is null if the tryRespawn() call was not caused by a placed end crystal -+ // Paper end ++ // Paper end - Perf: Do crystal-portal proximity check before entity lookup if (this.dragonKilled && this.respawnStage == null) { BlockPos blockposition = this.portalLocation; @@ -54,7 +54,7 @@ index b2a57cb75916d2724f18779c922005ef9bcc0b0e..c1ff2e15bc5da1a642872ac0fdcdc457 blockposition = this.portalLocation; } -+ // Paper start - check placed end crystal to portal proximity before attempting to respawn dragon ++ // Paper start - Perf: Do crystal-portal proximity check before entity lookup + if (placedEndCrystalPos != null) { + // The end crystal must be 0 or 1 higher than the portal origin + int dy = placedEndCrystalPos.getY() - blockposition.getY(); @@ -68,7 +68,7 @@ index b2a57cb75916d2724f18779c922005ef9bcc0b0e..c1ff2e15bc5da1a642872ac0fdcdc457 + return false; + } + } -+ // Paper end ++ // Paper end - Perf: Do crystal-portal proximity check before entity lookup + List list = Lists.newArrayList(); BlockPos blockposition1 = blockposition.above(1); diff --git a/patches/server/0995-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0993-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 89% rename from patches/server/0995-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/0993-Skip-POI-finding-if-stuck-in-vehicle.patch index e45ced771d..62f6c025a8 100644 --- a/patches/server/0995-Skip-POI-finding-if-stuck-in-vehicle.patch +++ b/patches/server/0993-Skip-POI-finding-if-stuck-in-vehicle.patch @@ -19,14 +19,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..8f8b29f80d1573981ccffd207dd6e0941e71a352 100644 +index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..abcc3ef59475ac170fd10b4dd4a4f3371faf17e0 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java @@ -47,6 +47,7 @@ public class AcquirePoi { return false; } else { mutableLong.setValue(time + 20L + (long)world.getRandom().nextInt(20)); -+ if (entity.getNavigation().isStuck()) mutableLong.add(200); // Paper - Wait an additional 10s to check again if they're stuck ++ if (entity.getNavigation().isStuck()) mutableLong.add(200); // Paper - Perf: Wait an additional 10s to check again if they're stuck PoiManager poiManager = world.getPoiManager(); long2ObjectMap.long2ObjectEntrySet().removeIf((entry) -> { return !entry.getValue().isStillValid(time); diff --git a/patches/server/0996-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0994-Add-slot-sanity-checks-in-container-clicks.patch similarity index 79% rename from patches/server/0996-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/0994-Add-slot-sanity-checks-in-container-clicks.patch index eb4e322b31..8735a4ad5a 100644 --- a/patches/server/0996-Add-slot-sanity-checks-in-container-clicks.patch +++ b/patches/server/0994-Add-slot-sanity-checks-in-container-clicks.patch @@ -5,31 +5,31 @@ Subject: [PATCH] Add slot sanity checks in container clicks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e04ba1e0949e3fa237ea002c37229f5cb03275cb..81e143aa2af57ee40513452ef7f3dd9dad5c91e8 100644 +index b613bacfbc6f04b908db85aafaba45a170a0a0f1..d11f8dd119e7d2d46217760fd125115e1da6af30 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2990,6 +2990,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2992,6 +2992,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl break; case SWAP: if ((packet.getButtonNum() >= 0 && packet.getButtonNum() < 9) || packet.getButtonNum() == 40) { -+ // Paper start ++ // Paper start - Add slot sanity checks to container clicks + if (packet.getSlotNum() < 0) { + action = InventoryAction.NOTHING; + break; + } -+ // Paper end ++ // Paper end - Add slot sanity checks to container clicks click = (packet.getButtonNum() == 40) ? ClickType.SWAP_OFFHAND : ClickType.NUMBER_KEY; Slot clickedSlot = this.player.containerMenu.getSlot(packet.getSlotNum()); if (clickedSlot.mayPickup(this.player)) { diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -index 9ee3c2e0dcfaa4280be4973479c6490ded33809c..cdd230337584befb37f2e48b24dd504398b431a5 100644 +index 9ee3c2e0dcfaa4280be4973479c6490ded33809c..924e2d510752aa332129d79574ce85c5a4d5f0a4 100644 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java @@ -423,6 +423,7 @@ public abstract class AbstractContainerMenu { this.resetQuickCraft(); } } else if (this.quickcraftStatus == 1) { -+ if (slotIndex < 0) return; // Paper ++ if (slotIndex < 0) return; // Paper - Add slot sanity checks to container clicks slot = (Slot) this.slots.get(slotIndex); itemstack = this.getCarried(); if (AbstractContainerMenu.canItemQuickReplace(slot, itemstack, true) && slot.mayPlace(itemstack) && (this.quickcraftType == 2 || itemstack.getCount() > this.quickcraftSlots.size()) && this.canDragTo(slot)) { @@ -37,7 +37,7 @@ index 9ee3c2e0dcfaa4280be4973479c6490ded33809c..cdd230337584befb37f2e48b24dd5043 int j2; if (actionType == ClickType.SWAP && (button >= 0 && button < 9 || button == 40)) { -+ if (slotIndex < 0) return; // Paper ++ if (slotIndex < 0) return; // Paper - Add slot sanity checks to container clicks ItemStack itemstack4 = playerinventory.getItem(button); slot = (Slot) this.slots.get(slotIndex); diff --git a/patches/server/0997-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0995-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 89% rename from patches/server/0997-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/0995-Call-BlockRedstoneEvents-for-lecterns.patch index aebbe3eb31..c5d3495f31 100644 --- a/patches/server/0997-Call-BlockRedstoneEvents-for-lecterns.patch +++ b/patches/server/0995-Call-BlockRedstoneEvents-for-lecterns.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Call BlockRedstoneEvents for lecterns diff --git a/src/main/java/net/minecraft/world/level/block/LecternBlock.java b/src/main/java/net/minecraft/world/level/block/LecternBlock.java -index f14f35e0f5a087845f7229a68e996feb06c946d4..38f68917119b30be2787363697a0501080362a90 100644 +index f14f35e0f5a087845f7229a68e996feb06c946d4..95652e63870f3d7473b1bb144515a77d9d8c3b1c 100644 --- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java +++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java @@ -178,6 +178,16 @@ public class LecternBlock extends BaseEntityBlock { @@ -21,7 +21,7 @@ index f14f35e0f5a087845f7229a68e996feb06c946d4..38f68917119b30be2787363697a05010 + return; + } + } -+ // Paper end ++ // Paper end - call BlockRedstoneEvents for lecterns world.setBlock(pos, (BlockState) state.setValue(LecternBlock.POWERED, powered), 3); LecternBlock.updateBelow(world, pos, state); } diff --git a/patches/server/0998-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0996-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/0998-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/0996-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/0999-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0997-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/0999-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/0997-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/1000-Fix-spigot-s-Forced-Stats.patch b/patches/server/0998-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/1000-Fix-spigot-s-Forced-Stats.patch rename to patches/server/0998-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/1001-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0999-Add-missing-InventoryHolders-to-inventories.patch similarity index 99% rename from patches/server/1001-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/0999-Add-missing-InventoryHolders-to-inventories.patch index 2cac87c8e0..b98da8fd7d 100644 --- a/patches/server/1001-Add-missing-InventoryHolders-to-inventories.patch +++ b/patches/server/0999-Add-missing-InventoryHolders-to-inventories.patch @@ -57,7 +57,7 @@ index 061e870e0cdd5bf00351b7e8104361bce86809f3..5cdb0face59ee3a12d8aba95ebe16658 public SimpleContainer(int i, org.bukkit.inventory.InventoryHolder owner) { this.bukkitOwner = owner; diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java -index cdd230337584befb37f2e48b24dd504398b431a5..0727dcbd561c0b488733aa0ad0d3f256d0f76c66 100644 +index 924e2d510752aa332129d79574ce85c5a4d5f0a4..eb8155e29821d5622320d69041c5a1a6406afbbc 100644 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java @@ -1029,4 +1029,15 @@ public abstract class AbstractContainerMenu { diff --git a/patches/server/1002-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1000-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/1002-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/1000-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/1003-Actually-optimise-explosions.patch b/patches/server/1001-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1003-Actually-optimise-explosions.patch rename to patches/server/1001-Actually-optimise-explosions.patch diff --git a/patches/server/1004-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1002-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/1004-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/1002-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/1005-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1003-Remove-Spigot-Bug-Fix-for-MC-109346.patch similarity index 92% rename from patches/server/1005-Remove-Spigot-Bug-Fix-for-MC-109346.patch rename to patches/server/1003-Remove-Spigot-Bug-Fix-for-MC-109346.patch index d3ecc69301..07c14191bb 100644 --- a/patches/server/1005-Remove-Spigot-Bug-Fix-for-MC-109346.patch +++ b/patches/server/1003-Remove-Spigot-Bug-Fix-for-MC-109346.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove Spigot Bug Fix for MC-109346 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 9f1b424f8437f0f859d4f177ecc52233ad8e3357..35674f92a67f93382103c2766df4b678ba5c862f 100644 +index ec8fcc3f105c6265de02fcaabc4b51eca626aa5e..1039e6f6555d27ecf8de8b5cf65ba75d15501686 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -348,12 +348,6 @@ public class ServerEntity { diff --git a/patches/server/1006-Fix-SuspiciousStewMeta.patch b/patches/server/1004-Fix-SuspiciousStewMeta.patch similarity index 100% rename from patches/server/1006-Fix-SuspiciousStewMeta.patch rename to patches/server/1004-Fix-SuspiciousStewMeta.patch diff --git a/patches/server/1007-Optimise-chunk-tick-iteration.patch b/patches/server/1005-Optimise-chunk-tick-iteration.patch similarity index 99% rename from patches/server/1007-Optimise-chunk-tick-iteration.patch rename to patches/server/1005-Optimise-chunk-tick-iteration.patch index d194ec1e97..335327b20a 100644 --- a/patches/server/1007-Optimise-chunk-tick-iteration.patch +++ b/patches/server/1005-Optimise-chunk-tick-iteration.patch @@ -108,7 +108,7 @@ index 2b998bdbe49bf8211b755e0eb7c1bf13ac280eab..627a88ec8c3b215b19b55a6d461c8754 List list; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 0405bc1e17975a74af3d56edf34354f5cb553a1c..71606bca60410c8ab6fd6427dc11e35614928702 100644 +index 00a98841d88e8b13501116caa7a03534e1025159..abe94c37513f41dce1ec924d00205a752d3195aa 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -191,6 +191,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -365,7 +365,7 @@ index 5152979bf81345fc365e7b16028c7d970d2f5856..44ada45d9bf2d9b48e5de1c3cb1a8559 gameprofilerfiller.pop(); } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 7f370d7f6e576ef719e69734dd81ec950a1f5022..3ca06c5dfed3bc2006bf2f42444353bfab14096d 100644 +index 2eb320dc136712aac3896a5aacf8800dc2c121ba..67a4c0a436cb1a0b5b9fc7c80dc501b1fb546f8f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -325,6 +325,9 @@ public class ServerPlayer extends Player { diff --git a/patches/server/1008-Lag-compensation-ticks.patch b/patches/server/1006-Lag-compensation-ticks.patch similarity index 98% rename from patches/server/1008-Lag-compensation-ticks.patch rename to patches/server/1006-Lag-compensation-ticks.patch index 826376376b..5a7e6880f5 100644 --- a/patches/server/1008-Lag-compensation-ticks.patch +++ b/patches/server/1006-Lag-compensation-ticks.patch @@ -52,7 +52,7 @@ index a7f2e8755af41abc66070f1971e526b4f05bc710..9a7d5aa722eb1e56da8e9e11b46179c9 // Add env and gen to constructor, IWorldDataServer -> WorldDataServer public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index cc1c077c3e91d1f8852fcd6ea939864cfce398a8..4634f4fbb0c06c68436c5e30069621c9fcd4ffb5 100644 +index 16cb80c64ebf33b9621fdbd6655becb85db487fa..8e6b4880e9596cf2e9c34fb90f03897f05475000 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -124,7 +124,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/1009-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1007-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/1009-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/1007-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/1010-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1008-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/1010-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/1008-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/1011-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1009-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/1011-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/1009-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/1012-Optimise-nearby-player-retrieval.patch b/patches/server/1010-Optimise-nearby-player-retrieval.patch similarity index 69% rename from patches/server/1012-Optimise-nearby-player-retrieval.patch rename to patches/server/1010-Optimise-nearby-player-retrieval.patch index 9165214b11..2659e9fd38 100644 --- a/patches/server/1012-Optimise-nearby-player-retrieval.patch +++ b/patches/server/1010-Optimise-nearby-player-retrieval.patch @@ -127,6 +127,73 @@ index 9a7d5aa722eb1e56da8e9e11b46179c9f9ab716f..672dcf1d82b4a858167be678888d3fb6 // Add env and gen to constructor, IWorldDataServer -> WorldDataServer public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { +diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java +index ed1b95ec694b0fe8b647964b18b8c33707fc0b47..65cd42ce9f553e0aa5bf248bdbf902f9d1f55460 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java ++++ b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java +@@ -21,18 +21,50 @@ public class PlayerSensor extends Sensor { + + @Override + protected void doTick(ServerLevel world, LivingEntity entity) { +- List list = world.players().stream().filter(EntitySelector.NO_SPECTATORS).filter((player) -> { +- return entity.closerThan(player, 16.0D); +- }).sorted(Comparator.comparingDouble(entity::distanceToSqr)).collect(Collectors.toList()); ++ // Paper start - Perf: optimise nearby player retrieval & remove streams from hot code ++ io.papermc.paper.util.player.NearbyPlayers nearbyPlayers = world.chunkSource.chunkMap.getNearbyPlayers(); ++ net.minecraft.world.phys.Vec3 entityPos = entity.position(); ++ com.destroystokyo.paper.util.maplist.ReferenceList nearby = nearbyPlayers.getPlayersByChunk( ++ entity.chunkPosition().x, ++ entity.chunkPosition().z, ++ io.papermc.paper.util.player.NearbyPlayers.NearbyMapType.GENERAL_REALLY_SMALL ++ ); ++ ++ List players = new java.util.ArrayList<>(nearby == null ? 0 : nearby.size()); ++ if (nearby != null) { ++ Object[] rawData = nearby.getRawData(); ++ for (int index = 0, len = nearby.size(); index < len; ++index) { ++ net.minecraft.server.level.ServerPlayer player = (net.minecraft.server.level.ServerPlayer) rawData[index]; ++ if (player.isSpectator()) { ++ continue; ++ } ++ if (player.distanceToSqr(entityPos.x, entityPos.y, entityPos.z) >= (16.0 * 16.0)) { ++ continue; ++ } ++ players.add(player); ++ } ++ } ++ players.sort(Comparator.comparingDouble(entity::distanceToSqr)); + Brain brain = entity.getBrain(); +- brain.setMemory(MemoryModuleType.NEAREST_PLAYERS, list); +- List list2 = list.stream().filter((player) -> { +- return isEntityTargetable(entity, player); +- }).collect(Collectors.toList()); +- brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, list2.isEmpty() ? null : list2.get(0)); +- Optional optional = list2.stream().filter((player) -> { +- return isEntityAttackable(entity, player); +- }).findFirst(); +- brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, optional); ++ ++ brain.setMemory(MemoryModuleType.NEAREST_PLAYERS, players); ++ ++ Player firstTargetable = null; ++ Player firstAttackable = null; ++ for (Player player : players) { ++ if (firstTargetable == null && Sensor.isEntityTargetable(entity, player)) { ++ firstTargetable = player; ++ } ++ if (firstAttackable == null && Sensor.isEntityAttackable(entity, player)) { ++ firstAttackable = player; ++ } ++ ++ if (firstAttackable != null && firstTargetable != null) { ++ break; ++ } ++ } ++ brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, firstTargetable); ++ brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, Optional.ofNullable(firstAttackable)); ++ // Paper end - Perf: optimise nearby player retrieval & remove streams from hot code + } + } diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java index 58422f00c7d64dbd1cf6d7211c9838875cbe7778..c157309ac78e7af084d3acb6e8b2bcd469a39d5e 100644 --- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java diff --git a/patches/server/1014-Fix-missing-map-initialize-event-call.patch b/patches/server/1011-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/1014-Fix-missing-map-initialize-event-call.patch rename to patches/server/1011-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/1015-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1012-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/1015-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/1012-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/1013-Remove-streams-for-villager-AI.patch b/patches/server/1013-Remove-streams-for-villager-AI.patch deleted file mode 100644 index e5c6b2d9ed..0000000000 --- a/patches/server/1013-Remove-streams-for-villager-AI.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Spottedleaf -Date: Thu, 27 Aug 2020 20:51:40 -0700 -Subject: [PATCH] Remove streams for villager AI - - -diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java -index b45c4f50705f80163d44d9e588f86a5770f5be38..64165fed12c6c76d4ceb36d69f47a1235c1e8e44 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java -+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java -@@ -52,7 +52,7 @@ public class GateBehavior implements BehaviorControl - if (this.hasRequiredMemories(entity)) { - this.status = Behavior.Status.RUNNING; - this.orderPolicy.apply(this.behaviors); -- this.runningPolicy.apply(this.behaviors.stream(), world, entity, time); -+ this.runningPolicy.apply(this.behaviors.entries, world, entity, time); // Paper - Remove streams - return true; - } else { - return false; -@@ -61,11 +61,13 @@ public class GateBehavior implements BehaviorControl - - @Override - public final void tickOrStop(ServerLevel world, E entity, long time) { -- this.behaviors.stream().filter((task) -> { -- return task.getStatus() == Behavior.Status.RUNNING; -- }).forEach((task) -> { -- task.tickOrStop(world, entity, time); -- }); -+ // Paper start - Remove streams -+ for (BehaviorControl task : this.behaviors) { -+ if (task.getStatus() == Behavior.Status.RUNNING) { -+ task.tickOrStop(world, entity, time); -+ } -+ } -+ // Paper end - Remove streams - if (this.behaviors.stream().noneMatch((task) -> { - return task.getStatus() == Behavior.Status.RUNNING; - })) { -@@ -77,11 +79,13 @@ public class GateBehavior implements BehaviorControl - @Override - public final void doStop(ServerLevel world, E entity, long time) { - this.status = Behavior.Status.STOPPED; -- this.behaviors.stream().filter((task) -> { -- return task.getStatus() == Behavior.Status.RUNNING; -- }).forEach((task) -> { -- task.doStop(world, entity, time); -- }); -+ // Paper start - Remove streams -+ for (BehaviorControl behavior : this.behaviors) { -+ if (behavior.getStatus() == Behavior.Status.RUNNING) { -+ behavior.doStop(world, entity, time); -+ } -+ } -+ // Paper end - Remove streams - this.exitErasedMemories.forEach(entity.getBrain()::eraseMemory); - } - -@@ -117,25 +121,31 @@ public class GateBehavior implements BehaviorControl - public static enum RunningPolicy { - RUN_ONE { - @Override -- public void apply(Stream> tasks, ServerLevel world, E entity, long time) { -- tasks.filter((task) -> { -- return task.getStatus() == Behavior.Status.STOPPED; -- }).filter((task) -> { -- return task.tryStart(world, entity, time); -- }).findFirst(); -+ // Paper start - Remove streams -+ public void apply(List>> tasks, ServerLevel world, E entity, long time) { -+ for (ShufflingList.WeightedEntry> task : tasks) { -+ final BehaviorControl behavior = task.getData(); -+ if (behavior.getStatus() == Behavior.Status.STOPPED && behavior.tryStart(world, entity, time)) { -+ break; -+ } -+ } -+ // Paper end - Remove streams - } - }, - TRY_ALL { - @Override -- public void apply(Stream> tasks, ServerLevel world, E entity, long time) { -- tasks.filter((task) -> { -- return task.getStatus() == Behavior.Status.STOPPED; -- }).forEach((task) -> { -- task.tryStart(world, entity, time); -- }); -+ // Paper start - Remove streams -+ public void apply(List>> tasks, ServerLevel world, E entity, long time) { -+ for (ShufflingList.WeightedEntry> task : tasks) { -+ final BehaviorControl behavior = task.getData(); -+ if (behavior.getStatus() == Behavior.Status.STOPPED) { -+ behavior.tryStart(world, entity, time); -+ } -+ } -+ // Paper end - Remove streams - } - }; - -- public abstract void apply(Stream> tasks, ServerLevel world, E entity, long time); -+ public abstract void apply(List>> tasks, ServerLevel world, E entity, long time); // Paper - Remove streams - } - } -diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java -index 731ef21dbbd25d6924717de42f4569a9b5935643..fe3ab3d388f0481fb0db06b7f730f868dbf8e8a5 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java -+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java -@@ -14,7 +14,7 @@ import java.util.stream.Stream; - import net.minecraft.util.RandomSource; - - public class ShufflingList implements Iterable { -- protected final List> entries; -+ public final List> entries; // Paper - public - private final RandomSource random = RandomSource.create(); - private final boolean isUnsafe; // Paper - -diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java -index 1dfcc5cba6ffb463acf161a23fff1ca452184290..9958690971a2f14bfdb8841e466fa783452c5b0c 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java -+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java -@@ -25,13 +25,16 @@ public class NearestItemSensor extends Sensor { - protected void doTick(ServerLevel world, Mob entity) { - Brain brain = entity.getBrain(); - List list = world.getEntitiesOfClass(ItemEntity.class, entity.getBoundingBox().inflate(32.0D, 16.0D, 32.0D), (itemEntity) -> { -- return true; -+ return itemEntity.closerThan(entity, MAX_DISTANCE_TO_WANTED_ITEM) && entity.wantsToPickUp(itemEntity.getItem()); // Paper - move predicate into getEntities - }); -- list.sort(Comparator.comparingDouble(entity::distanceToSqr)); -+ list.sort((e1, e2) -> Double.compare(entity.distanceToSqr(e1), entity.distanceToSqr(e2))); // better to take the sort perf hit than using line of sight more than we need to. -+ // Paper start - Remove streams - // Paper start - remove streams in favour of lists - ItemEntity nearest = null; -- for (ItemEntity entityItem : list) { -- if (entity.wantsToPickUp(entityItem.getItem()) && entityItem.closerThan(entity, 32.0D) && entity.hasLineOfSight(entityItem)) { -+ for (int i = 0; i < list.size(); i++) { -+ ItemEntity entityItem = list.get(i); -+ if (entity.hasLineOfSight(entityItem)) { -+ // Paper end - Remove streams - nearest = entityItem; - break; - } -diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java -index 312775d0430f793720211dc29bb293503e799d11..9c6b1027dcda0ff4fd357d3cb70fcf5b9f6127a0 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java -+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java -@@ -21,25 +21,51 @@ public class PlayerSensor extends Sensor { - - @Override - protected void doTick(ServerLevel world, LivingEntity entity) { -- List players = new java.util.ArrayList<>(world.players()); -- players.removeIf(player -> !EntitySelector.NO_SPECTATORS.test(player) || !entity.closerThan(player, 16.0D)); -- players.sort(Comparator.comparingDouble(entity::distanceTo)); -+ // Paper start - remove streams -+ io.papermc.paper.util.player.NearbyPlayers nearbyPlayers = world.chunkSource.chunkMap.getNearbyPlayers(); -+ net.minecraft.world.phys.Vec3 entityPos = entity.position(); -+ com.destroystokyo.paper.util.maplist.ReferenceList nearby = nearbyPlayers.getPlayersByChunk( -+ entity.chunkPosition().x, -+ entity.chunkPosition().z, -+ io.papermc.paper.util.player.NearbyPlayers.NearbyMapType.GENERAL_REALLY_SMALL -+ ); -+ -+ List players = new java.util.ArrayList<>(nearby == null ? 0 : nearby.size()); -+ if (nearby != null) { -+ Object[] rawData = nearby.getRawData(); -+ for (int index = 0, len = nearby.size(); index < len; ++index) { -+ net.minecraft.server.level.ServerPlayer player = (net.minecraft.server.level.ServerPlayer)rawData[index]; -+ if (player.isSpectator()) { -+ continue; -+ } -+ if (player.distanceToSqr(entityPos.x, entityPos.y, entityPos.z) >= (16.0 * 16.0)) { -+ continue; -+ } -+ players.add((Player)player); -+ } -+ } -+ players.sort((e1, e2) -> Double.compare(entity.distanceToSqr(e1), entity.distanceToSqr(e2))); - Brain brain = entity.getBrain(); - - brain.setMemory(MemoryModuleType.NEAREST_PLAYERS, players); - -- Player nearest = null, nearestTargetable = null; -- for (Player player : players) { -- if (Sensor.isEntityTargetable(entity, player)) { -- if (nearest == null) nearest = player; -- if (Sensor.isEntityAttackable(entity, player)) { -- nearestTargetable = player; -- break; // Both variables are assigned, no reason to loop further -- } -+ Player firstTargetable = null; -+ Player firstAttackable = null; -+ for (int index = 0, len = players.size(); index < len; ++index) { -+ Player player = players.get(index); -+ if (firstTargetable == null && isEntityTargetable(entity, player)) { -+ firstTargetable = player; -+ } -+ if (firstAttackable == null && isEntityAttackable(entity, player)) { -+ firstAttackable = player; -+ } -+ -+ if (firstAttackable != null && firstTargetable != null) { -+ break; - } - } -- brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, nearest); -- brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, nearestTargetable); -- // Paper end -+ brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, firstTargetable); -+ brain.setMemory(MemoryModuleType.NEAREST_VISIBLE_ATTACKABLE_PLAYER, Optional.ofNullable(firstAttackable)); -+ // Paper end - remove streams - } - } diff --git a/patches/server/1016-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1013-Use-correct-variable-for-initializing-CraftLootTable.patch similarity index 100% rename from patches/server/1016-Use-correct-variable-for-initializing-CraftLootTable.patch rename to patches/server/1013-Use-correct-variable-for-initializing-CraftLootTable.patch diff --git a/patches/server/1017-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1014-Make-setVelocity-method-of-Fireballs-change-the-trav.patch similarity index 100% rename from patches/server/1017-Make-setVelocity-method-of-Fireballs-change-the-trav.patch rename to patches/server/1014-Make-setVelocity-method-of-Fireballs-change-the-trav.patch diff --git a/patches/server/1018-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1015-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/1018-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/1015-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/1019-Add-player-idle-duration-API.patch b/patches/server/1016-Add-player-idle-duration-API.patch similarity index 91% rename from patches/server/1019-Add-player-idle-duration-API.patch rename to patches/server/1016-Add-player-idle-duration-API.patch index 5b6173313f..ca5244769b 100644 --- a/patches/server/1019-Add-player-idle-duration-API.patch +++ b/patches/server/1016-Add-player-idle-duration-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API Implements API for getting and resetting a player's idle duration. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3507696d2b83b09b781ac0e6f3eefd6eed632ab4..f125cff31de52c4d761b75e82e1577888da72667 100644 +index 0eaa7d410ef93713f59d0cfb3cf4112a004e886c..9314506770f7841d15371d81c1c63504d1ecd2ad 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3311,6 +3311,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1020-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1017-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 84% rename from patches/server/1020-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/1017-Don-t-check-if-we-can-see-non-visible-entities.patch index 18496660d9..5bfab6e4e0 100644 --- a/patches/server/1020-Don-t-check-if-we-can-see-non-visible-entities.patch +++ b/patches/server/1017-Don-t-check-if-we-can-see-non-visible-entities.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Don't check if we can see non-visible entities diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 71606bca60410c8ab6fd6427dc11e35614928702..bde56e7bf595a8ecfe77c04eb3fcaf1ce4d92670 100644 +index abe94c37513f41dce1ec924d00205a752d3195aa..4a473f75c1c14549acd134c20adbe0c52663405f 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1435,7 +1435,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider - // Paper end - check Y + // Paper end - Configurable entity tracking range by Y // CraftBukkit start - respect vanish API - if (!player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { diff --git a/patches/server/1021-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1018-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/1021-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/1018-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/1022-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1019-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 90% rename from patches/server/1022-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/1019-Allow-null-itemstack-for-Player-sendEquipmentChange.patch index f8f4d1525a..d5c60aea75 100644 --- a/patches/server/1022-Allow-null-itemstack-for-Player-sendEquipmentChange.patch +++ b/patches/server/1019-Allow-null-itemstack-for-Player-sendEquipmentChange.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f125cff31de52c4d761b75e82e1577888da72667..558b446cf58f6b66bea23236b24f08f6e281e533 100644 +index 9314506770f7841d15371d81c1c63504d1ecd2ad..5513ceedd304995d6c8cbec0f6b629ef1b30d3e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1083,7 +1083,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1023-Optimize-VarInts.patch b/patches/server/1020-Optimize-VarInts.patch similarity index 100% rename from patches/server/1023-Optimize-VarInts.patch rename to patches/server/1020-Optimize-VarInts.patch diff --git a/patches/server/1024-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1021-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/1024-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/1021-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/1025-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1022-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/1025-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/1022-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/1026-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1023-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/1026-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/1023-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/1028-Expand-LingeringPotion-API.patch b/patches/server/1024-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/1028-Expand-LingeringPotion-API.patch rename to patches/server/1024-Expand-LingeringPotion-API.patch diff --git a/patches/server/1029-Add-MaterialTagsTest.patch b/patches/server/1025-Add-MaterialTagsTest.patch similarity index 100% rename from patches/server/1029-Add-MaterialTagsTest.patch rename to patches/server/1025-Add-MaterialTagsTest.patch diff --git a/patches/server/1030-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1026-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/1030-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/1026-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/1031-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1027-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/1031-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/1027-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/1027-fix-secure-profile-with-proxy-online-mode.patch b/patches/server/1027-fix-secure-profile-with-proxy-online-mode.patch deleted file mode 100644 index f0b910f6e1..0000000000 --- a/patches/server/1027-fix-secure-profile-with-proxy-online-mode.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: NonSwag -Date: Sun, 8 Oct 2023 09:55:56 +0200 -Subject: [PATCH] fix secure profile with proxy online mode - - -diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 5969f45d479188aceedfbe7931c69c36de78a705..c1402d4dfbddc14ca748efa24e7d62d81abf4e58 100644 ---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -638,7 +638,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - public boolean enforceSecureProfile() { - DedicatedServerProperties dedicatedserverproperties = this.getProperties(); - -- return dedicatedserverproperties.enforceSecureProfile && dedicatedserverproperties.onlineMode && this.services.canValidateProfileKeys(); -+ // Paper start - fix secure profile with proxy online mode -+ return dedicatedserverproperties.enforceSecureProfile -+ && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() -+ && this.services.canValidateProfileKeys(); -+ // Paper end - fix secure profile with proxy online mode - } - - @Override diff --git a/patches/server/1032-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1028-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/1032-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/1028-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/1033-Add-UUID-attribute-modifier-API.patch b/patches/server/1029-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/1033-Add-UUID-attribute-modifier-API.patch rename to patches/server/1029-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/1034-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1030-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/server/1034-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/1030-Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/server/1035-Lazily-create-LootContext-for-criterions.patch b/patches/server/1031-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/1035-Lazily-create-LootContext-for-criterions.patch rename to patches/server/1031-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/1036-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/1032-Don-t-fire-sync-events-during-worldgen.patch similarity index 99% rename from patches/server/1036-Don-t-fire-sync-events-during-worldgen.patch rename to patches/server/1032-Don-t-fire-sync-events-during-worldgen.patch index 22efdd7203..7d3e2ef653 100644 --- a/patches/server/1036-Don-t-fire-sync-events-during-worldgen.patch +++ b/patches/server/1032-Don-t-fire-sync-events-during-worldgen.patch @@ -31,7 +31,7 @@ index 79b6602570de0e213faef04f9605f206aa5b7840..0567fbf194d3dfef3f2348c4b1f69ac8 if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a152716a0dedc39d6d606476d8e3ba542f773d56..c80a7a476c6363e526f26a3c7a5ed0a277ca0394 100644 +index ec6a75e266725ce9de09f44cb7ed4096cf23a211..63e445beaeedcbd6f06991e7ef504af9943e0c9f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -713,7 +713,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/1037-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1033-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 93% rename from patches/server/1037-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/1033-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch index 2a28b856f5..ccb27e52d9 100644 --- a/patches/server/1037-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch +++ b/patches/server/1033-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix CraftMetaItem#getAttributeModifier duplication check diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index ba2da16e1e17d9544535511939302da633e8ebcc..d8ac86c3a89e29696e23b8ee6fddb84eb0313ea6 100644 +index baf31c109ee8b5e59acd7ff5fc537ea46f27d164..efc6ca53c048dbd49438ce0f7718de332fd5de2f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1167,7 +1167,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/1038-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1034-Restore-vanilla-entity-drops-behavior.patch similarity index 98% rename from patches/server/1038-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/1034-Restore-vanilla-entity-drops-behavior.patch index c24ef852cb..eedc31601e 100644 --- a/patches/server/1038-Restore-vanilla-entity-drops-behavior.patch +++ b/patches/server/1034-Restore-vanilla-entity-drops-behavior.patch @@ -9,7 +9,7 @@ on dropping the item instead of generalizing it for all dropped items like CB does. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3ca06c5dfed3bc2006bf2f42444353bfab14096d..a3037dccab32597aa99e1590e1ea42fcec06bb0c 100644 +index 67a4c0a436cb1a0b5b9fc7c80dc501b1fb546f8f..d8bea03eb39b393751a69c4cfc8c004215ebd3d3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -944,22 +944,20 @@ public class ServerPlayer extends Player { @@ -50,7 +50,7 @@ index 3ca06c5dfed3bc2006bf2f42444353bfab14096d..a3037dccab32597aa99e1590e1ea42fc if (entityitem == null) { return null; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c80a7a476c6363e526f26a3c7a5ed0a277ca0394..26ee8f19a3f7d722060170c4e2c5c1aa8c03d28d 100644 +index 63e445beaeedcbd6f06991e7ef504af9943e0c9f..020cddd4c62aa952ae0f9d5a0e73d033fb3ab7c8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2703,6 +2703,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -165,7 +165,7 @@ index ab708b256183fc54fe8e13f341d8a38acf611739..a9c1f99ba2461333bd154ac16e812031 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 93bf055d1b050c58677e8cec39e95b53b879ec1d..2fba13f4355fc7c32fa80935416014b292a6beeb 100644 +index e42c87a38787e3528dd663627da9c4286e1d8bfc..69bce85eb00b4f8d26c4e1333cf778ef5084d07b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -939,17 +939,21 @@ public class CraftEventFactory { diff --git a/patches/server/1039-Add-Structure-check-API.patch b/patches/server/1035-Add-Structure-check-API.patch similarity index 100% rename from patches/server/1039-Add-Structure-check-API.patch rename to patches/server/1035-Add-Structure-check-API.patch diff --git a/patches/server/1040-Dont-resend-blocks-on-interactions.patch b/patches/server/1036-Dont-resend-blocks-on-interactions.patch similarity index 99% rename from patches/server/1040-Dont-resend-blocks-on-interactions.patch rename to patches/server/1036-Dont-resend-blocks-on-interactions.patch index d518c20667..89a6d56c83 100644 --- a/patches/server/1040-Dont-resend-blocks-on-interactions.patch +++ b/patches/server/1036-Dont-resend-blocks-on-interactions.patch @@ -8,7 +8,7 @@ In general, the client now has an acknowledgment system which will prevent block It should be noted that this system does not yet support block entities, so those still need to resynced when needed. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 4634f4fbb0c06c68436c5e30069621c9fcd4ffb5..51bf6c740ac08548eedf0c026c5a66d6a3c6d83e 100644 +index 8e6b4880e9596cf2e9c34fb90f03897f05475000..c4bafa1b5c50d953502b5d918eb28dfe692a180d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -199,7 +199,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/1041-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/1037-Keep-previous-behavior-for-setResourcePack.patch similarity index 94% rename from patches/server/1041-Keep-previous-behavior-for-setResourcePack.patch rename to patches/server/1037-Keep-previous-behavior-for-setResourcePack.patch index f3d9528b31..255ed26116 100644 --- a/patches/server/1041-Keep-previous-behavior-for-setResourcePack.patch +++ b/patches/server/1037-Keep-previous-behavior-for-setResourcePack.patch @@ -10,7 +10,7 @@ packs before sending the new pack. Other API exists for adding a new pack to the existing packs on a client. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 558b446cf58f6b66bea23236b24f08f6e281e533..39bf2b92cd8907afa13b9bf7f02553cd2539023b 100644 +index 5513ceedd304995d6c8cbec0f6b629ef1b30d3e7..103e311bb37e9686b53d8dde645f4a2d1301e4be 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2351,8 +2351,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1042-properly-read-and-store-sus-effect-duration.patch b/patches/server/1038-properly-read-and-store-sus-effect-duration.patch similarity index 100% rename from patches/server/1042-properly-read-and-store-sus-effect-duration.patch rename to patches/server/1038-properly-read-and-store-sus-effect-duration.patch diff --git a/patches/server/1043-Use-correct-max-stack-size-in-crafter.patch b/patches/server/1039-Use-correct-max-stack-size-in-crafter.patch similarity index 100% rename from patches/server/1043-Use-correct-max-stack-size-in-crafter.patch rename to patches/server/1039-Use-correct-max-stack-size-in-crafter.patch diff --git a/patches/server/1044-add-more-scoreboard-API.patch b/patches/server/1040-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/1044-add-more-scoreboard-API.patch rename to patches/server/1040-add-more-scoreboard-API.patch diff --git a/patches/server/1045-Improve-Registry.patch b/patches/server/1041-Improve-Registry.patch similarity index 100% rename from patches/server/1045-Improve-Registry.patch rename to patches/server/1041-Improve-Registry.patch diff --git a/patches/server/1046-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/1042-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/server/1046-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/server/1042-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/server/1047-Add-experience-points-API.patch b/patches/server/1043-Add-experience-points-API.patch similarity index 97% rename from patches/server/1047-Add-experience-points-API.patch rename to patches/server/1043-Add-experience-points-API.patch index a14d0455bf..f8f091d895 100644 --- a/patches/server/1047-Add-experience-points-API.patch +++ b/patches/server/1043-Add-experience-points-API.patch @@ -18,7 +18,7 @@ index 7f3466340891b4409d1399ebeb2ca865d77841cd..0a9ee8aee52b34566f1613229951e33e // Paper start - send SoundEffect to everyone who can see fromEntity private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 39bf2b92cd8907afa13b9bf7f02553cd2539023b..da63b4050be25dcb91d04df8c2fcc643cbb0751d 100644 +index 103e311bb37e9686b53d8dde645f4a2d1301e4be..a4db69d8d814c03fa9efe79492c7cc3c736af5a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1821,6 +1821,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1048-Add-missing-InventoryType.patch b/patches/server/1044-Add-missing-InventoryType.patch similarity index 100% rename from patches/server/1048-Add-missing-InventoryType.patch rename to patches/server/1044-Add-missing-InventoryType.patch diff --git a/patches/server/1049-Add-drops-to-shear-events.patch b/patches/server/1045-Add-drops-to-shear-events.patch similarity index 99% rename from patches/server/1049-Add-drops-to-shear-events.patch rename to patches/server/1045-Add-drops-to-shear-events.patch index 74fd1a217b..bafa35c1b8 100644 --- a/patches/server/1049-Add-drops-to-shear-events.patch +++ b/patches/server/1045-Add-drops-to-shear-events.patch @@ -233,7 +233,7 @@ index 8adcfc8f6772a32b5915e4a07100e8eb735f907a..b5d6857eaf2bed14adcb5f5e80d91b44 } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2fba13f4355fc7c32fa80935416014b292a6beeb..92aff5734425f7b5765687d892d4db4af806a1ba 100644 +index 69bce85eb00b4f8d26c4e1333cf778ef5084d07b..f2de6aa8c1ed96bd0dfd028212cf3c5c570020c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1718,20 +1718,20 @@ public class CraftEventFactory { diff --git a/patches/server/1050-Add-PlayerShieldDisableEvent.patch b/patches/server/1046-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/server/1050-Add-PlayerShieldDisableEvent.patch rename to patches/server/1046-Add-PlayerShieldDisableEvent.patch diff --git a/patches/server/1051-Add-HiddenPotionEffect-API.patch b/patches/server/1047-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/server/1051-Add-HiddenPotionEffect-API.patch rename to patches/server/1047-Add-HiddenPotionEffect-API.patch diff --git a/patches/server/1052-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/1048-Correctly-check-if-bucket-dispenses-will-succeed-for.patch similarity index 100% rename from patches/server/1052-Correctly-check-if-bucket-dispenses-will-succeed-for.patch rename to patches/server/1048-Correctly-check-if-bucket-dispenses-will-succeed-for.patch diff --git a/patches/server/1053-fix-ItemMeta-removing-CustomModelData.patch b/patches/server/1049-fix-ItemMeta-removing-CustomModelData.patch similarity index 91% rename from patches/server/1053-fix-ItemMeta-removing-CustomModelData.patch rename to patches/server/1049-fix-ItemMeta-removing-CustomModelData.patch index 4beeab274c..6808c21745 100644 --- a/patches/server/1053-fix-ItemMeta-removing-CustomModelData.patch +++ b/patches/server/1049-fix-ItemMeta-removing-CustomModelData.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix ItemMeta removing CustomModelData diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index d8ac86c3a89e29696e23b8ee6fddb84eb0313ea6..8eae41077dc370e2286efaad4b9878c8ec04460e 100644 +index efc6ca53c048dbd49438ce0f7718de332fd5de2f..ef2b0e8aa9cce09097000029e39ff70f177ed3a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -381,7 +381,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/1054-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/1050-Validate-ResourceLocation-in-NBT-reading.patch similarity index 98% rename from patches/server/1054-Validate-ResourceLocation-in-NBT-reading.patch rename to patches/server/1050-Validate-ResourceLocation-in-NBT-reading.patch index 9151c477c8..4f9fa600b7 100644 --- a/patches/server/1054-Validate-ResourceLocation-in-NBT-reading.patch +++ b/patches/server/1050-Validate-ResourceLocation-in-NBT-reading.patch @@ -66,7 +66,7 @@ index 42e2be9286b75a1d34845f303ffc65e96fdd5416..0b5334004b9d0489e8465824870662b4 } diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 42ebd91196ae420eee57f4380abc558555457163..b61a367048c3d6dfef187fef35a5dc7471f891d0 100644 +index 6272b0e1e332789b983a486ee25226e2a1c9fdda..505fe5496044f090ce6f7d541b8c3e13c567b16d 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -560,7 +560,7 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/1055-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/1051-Properly-handle-experience-dropping-on-block-break.patch similarity index 96% rename from patches/server/1055-Properly-handle-experience-dropping-on-block-break.patch rename to patches/server/1051-Properly-handle-experience-dropping-on-block-break.patch index 275d1e2c27..edc6007964 100644 --- a/patches/server/1055-Properly-handle-experience-dropping-on-block-break.patch +++ b/patches/server/1051-Properly-handle-experience-dropping-on-block-break.patch @@ -21,7 +21,7 @@ index b8bf9eaae60040a3ba3d395712aa91940a71bea2..afd2e9bcdf94f3511bcd68cab5e72284 boolean flag1 = this.setBlock(pos, fluid.createLegacyBlock(), 3, maxUpdateDepth); diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index c450caed1a8d14f3bd56d0336a9bf72a5adca14f..a4b51821d8bcf9fdb7ff5e200c33ac2c565eece1 100644 +index 8ac67dd1b06eee08787150abdfc74a8cccec94fc..3f2fdf73e2e520838c7b59fe994e67ab2d1a4d6b 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -333,23 +333,31 @@ public class Block extends BlockBehaviour implements ItemLike { @@ -61,10 +61,10 @@ index c450caed1a8d14f3bd56d0336a9bf72a5adca14f..a4b51821d8bcf9fdb7ff5e200c33ac2c @@ -433,7 +441,7 @@ public class Block extends BlockBehaviour implements ItemLike { player.awardStat(Stats.BLOCK_MINED.get(this)); player.causeFoodExhaustion(0.005F, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.BLOCK_MINED); // CraftBukkit - EntityExhaustionEvent - if (includeDrops) { // Paper + if (includeDrops) { // Paper - fix drops not preventing stats/food exhaustion - Block.dropResources(state, world, pos, blockEntity, player, tool); + Block.dropResources(state, world, pos, blockEntity, player, tool, dropExp); // Paper - Properly handle xp dropping - } // Paper + } // Paper - fix drops not preventing stats/food exhaustion } diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java diff --git a/patches/server/1056-Fixup-NamespacedKey-handling.patch b/patches/server/1052-Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/1056-Fixup-NamespacedKey-handling.patch rename to patches/server/1052-Fixup-NamespacedKey-handling.patch