diff --git a/patches/server/0004-Purpur-client-support.patch b/patches/server/0004-Purpur-client-support.patch new file mode 100644 index 000000000..ab367f5be --- /dev/null +++ b/patches/server/0004-Purpur-client-support.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Fri, 30 Jul 2021 14:31:25 -0500 +Subject: [PATCH] Purpur client support + + +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java +index 1c9aec21aa22d0d202a023e9252d1412685ed4b0..0f87a808432e46174d3494d92f2b1a5e7f663b1a 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java +@@ -258,6 +258,7 @@ public class ServerPlayer extends Player { + public Integer clientViewDistance; + // CraftBukkit end + public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper ++ public boolean purpurClient = false; // Purpur + + public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks + public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper +diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +index c4cea533f619624976c4d1290312ed1a6b250855..f0da340879f10d23b2d02e238ec944739390986e 100644 +--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java ++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +@@ -3104,6 +3104,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser + private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister"); + + private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support ++ private static final ResourceLocation PURPUR_CLIENT = new ResourceLocation("purpur", "client"); // Purpur + + @Override + public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { +@@ -3128,6 +3129,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser + ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex); + this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause + } ++ // Purpur start ++ } else if (packet.identifier.equals(PURPUR_CLIENT)) { ++ try { ++ player.purpurClient = true; ++ } catch (Exception ignore) { ++ } ++ // Purpur end + } else { + try { + byte[] data = new byte[packet.data.readableBytes()]; diff --git a/patches/server/0004-Component-related-conveniences.patch b/patches/server/0005-Component-related-conveniences.patch similarity index 95% rename from patches/server/0004-Component-related-conveniences.patch rename to patches/server/0005-Component-related-conveniences.patch index 75c5e4b27..8605991ee 100644 --- a/patches/server/0004-Component-related-conveniences.patch +++ b/patches/server/0005-Component-related-conveniences.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index dcba69c0ad3288ddc64dacc58b6fb857eed3109c..57200e6b419ab0793df6498467325b6d5690c17f 100644 +index 0f87a808432e46174d3494d92f2b1a5e7f663b1a..2aea5ddba1d5c4dd0afeaee58a3542d0c0000edd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1673,6 +1673,26 @@ public class ServerPlayer extends Player { +@@ -1674,6 +1674,26 @@ public class ServerPlayer extends Player { } // CraftBukkit end @@ -103,7 +103,7 @@ index 936ae5576902e6593bd21af4d3cf3998109347b5..6cb325b098fe64b746940ce79fd92732 this.server.sendMessage(message, sender); Iterator iterator = this.players.iterator(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d9265426ddb91a6cff634b8fcc3ed26072379f43..3d50e17f13a9c9678b8d912f874096fbd28a42ee 100644 +index 2453492429a743677db07e31d575c1473fedf4ad..28d7e18c9b53b7563b9c4af9afde4e1261d454e4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3565,6 +3565,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0005-Ridables.patch b/patches/server/0006-Ridables.patch similarity index 99% rename from patches/server/0005-Ridables.patch rename to patches/server/0006-Ridables.patch index eadbf53bf..ff31e3f5d 100644 --- a/patches/server/0005-Ridables.patch +++ b/patches/server/0006-Ridables.patch @@ -46,10 +46,10 @@ index f9ed48f5bbde84fd1804e482f2777b516cc3a1ef..29b841462037fa97f72971c490b617d1 return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9d759979372d83ddf203a8b6d52202d461136ecd..ac44d1c07ba6922d25592d750af326d34b625cec 100644 +index 2aea5ddba1d5c4dd0afeaee58a3542d0c0000edd..53806589d0138e43e50c4ca7c1e6fc9a3317d38c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -664,6 +664,15 @@ public class ServerPlayer extends Player { +@@ -665,6 +665,15 @@ public class ServerPlayer extends Player { } this.advancements.flushDirty(this); @@ -65,7 +65,7 @@ index 9d759979372d83ddf203a8b6d52202d461136ecd..ac44d1c07ba6922d25592d750af326d3 } public void doTick() { -@@ -2410,4 +2419,6 @@ public class ServerPlayer extends Player { +@@ -2411,4 +2420,6 @@ public class ServerPlayer extends Player { return (CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end @@ -73,7 +73,7 @@ index 9d759979372d83ddf203a8b6d52202d461136ecd..ac44d1c07ba6922d25592d750af326d3 + } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b5b1aab39f881c334aa7f5f0d713f78f7265f41b..757c9f9800de18ca8ece3583222c7d3a765f3bde 100644 +index f0da340879f10d23b2d02e238ec944739390986e..a0f529180ecd641fc4484d4afe3153ce39314285 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2412,6 +2412,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -4528,7 +4528,7 @@ index 37356b36f0ae12d55150f399318581fa77c30cee..4e667be589fd95eb61e57a99448939a9 Projectile(EntityType type, Level world) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d0d87fcca78ea5c7853d693bc617c2bd6cfed487..773e42ff93e01b9f2db41dc4e8273525c5c162dc 100644 +index faa4ad6af45ce1ef62084194340c6789634bff5f..ad7dbfa8dd5f38af87ec8980fd972ea4449da7ed 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -156,4 +156,9 @@ public class PurpurConfig { @@ -5752,7 +5752,7 @@ index 8ce49478441e77cedf5148ecb81d78b32660329e..fb5cd6fe7903f3f96af1abb55832bafb + // Purpur end } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ec00da61e422384276442fa23e496dc078f49d1a..0238bea72b9d4d6b92a03ec59c8697cbe88dbf5a 100644 +index d01d4ca873f8225d3503ecb102ce2eb7bfced421..5338d1638988c6fdd855eb9acf4fb7f6d4eaa498 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -537,6 +537,15 @@ public class CraftEventFactory { diff --git a/patches/server/0006-Configurable-entity-base-attributes.patch b/patches/server/0007-Configurable-entity-base-attributes.patch similarity index 100% rename from patches/server/0006-Configurable-entity-base-attributes.patch rename to patches/server/0007-Configurable-entity-base-attributes.patch diff --git a/patches/server/0007-Timings-stuff.patch b/patches/server/0008-Timings-stuff.patch similarity index 100% rename from patches/server/0007-Timings-stuff.patch rename to patches/server/0008-Timings-stuff.patch diff --git a/patches/server/0008-Barrels-and-enderchests-6-rows.patch b/patches/server/0009-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from patches/server/0008-Barrels-and-enderchests-6-rows.patch rename to patches/server/0009-Barrels-and-enderchests-6-rows.patch diff --git a/patches/server/0009-Advancement-API.patch b/patches/server/0010-Advancement-API.patch similarity index 100% rename from patches/server/0009-Advancement-API.patch rename to patches/server/0010-Advancement-API.patch diff --git a/patches/server/0010-Llama-API.patch b/patches/server/0011-Llama-API.patch similarity index 98% rename from patches/server/0010-Llama-API.patch rename to patches/server/0011-Llama-API.patch index 707c3e9e1..5f347ee25 100644 --- a/patches/server/0010-Llama-API.patch +++ b/patches/server/0011-Llama-API.patch @@ -25,7 +25,7 @@ index e037d618955de9a213a9cd90752b29d189faace4..34dec0a94840a8865f1d80857ec54a10 double d = this.llama.distanceToSqr(this.llama.getCaravanHead()); if (d > 676.0D) { diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java -index 397d9846ad645f98163a0bfae7a69ceaa6d5c3a4..92069543fd8f19ee037af59edd84c61f5216463f 100644 +index d664be25c2c2c527a44fa939e68e84d60effc144..5a0b9cfdd0b8d79b10f16c4a3ea1eed746c8887d 100644 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java @@ -65,6 +65,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0012-AFK-API.patch similarity index 98% rename from patches/server/0011-AFK-API.patch rename to patches/server/0012-AFK-API.patch index d64c754f3..a1bf3a512 100644 --- a/patches/server/0011-AFK-API.patch +++ b/patches/server/0012-AFK-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ac44d1c07ba6922d25592d750af326d34b625cec..0b0f4c1c53a575144206db9690855595c4f7003c 100644 +index 53806589d0138e43e50c4ca7c1e6fc9a3317d38c..a0d2480021b5cb4ae7e28d25869d78209a6096c2 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1948,8 +1948,58 @@ public class ServerPlayer extends Player { +@@ -1949,8 +1949,58 @@ public class ServerPlayer extends Player { public void resetLastActionTime() { this.lastActionTime = Util.getMillis(); @@ -68,7 +68,7 @@ index ac44d1c07ba6922d25592d750af326d34b625cec..0b0f4c1c53a575144206db9690855595 return this.stats; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 757c9f9800de18ca8ece3583222c7d3a765f3bde..65fb15671ed2947bc62753bc685656732a96feff 100644 +index a0f529180ecd641fc4484d4afe3153ce39314285..c6ef86206fc498a0fcd1c1527516d98e00a5df40 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -390,6 +390,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0012-Bring-back-server-name.patch b/patches/server/0013-Bring-back-server-name.patch similarity index 100% rename from patches/server/0012-Bring-back-server-name.patch rename to patches/server/0013-Bring-back-server-name.patch diff --git a/patches/server/0013-Configurable-server-mod-name.patch b/patches/server/0014-Configurable-server-mod-name.patch similarity index 100% rename from patches/server/0013-Configurable-server-mod-name.patch rename to patches/server/0014-Configurable-server-mod-name.patch diff --git a/patches/server/0014-LivingEntity-safeFallDistance.patch b/patches/server/0015-LivingEntity-safeFallDistance.patch similarity index 100% rename from patches/server/0014-LivingEntity-safeFallDistance.patch rename to patches/server/0015-LivingEntity-safeFallDistance.patch diff --git a/patches/server/0015-Lagging-threshold.patch b/patches/server/0016-Lagging-threshold.patch similarity index 100% rename from patches/server/0015-Lagging-threshold.patch rename to patches/server/0016-Lagging-threshold.patch diff --git a/patches/server/0016-ItemFactory-getMonsterEgg.patch b/patches/server/0017-ItemFactory-getMonsterEgg.patch similarity index 100% rename from patches/server/0016-ItemFactory-getMonsterEgg.patch rename to patches/server/0017-ItemFactory-getMonsterEgg.patch diff --git a/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0018-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 97% rename from patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/server/0018-PlayerSetSpawnerTypeWithEggEvent.patch index 4fcb308e7..fcdfe5746 100644 --- a/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch +++ b/patches/server/0018-PlayerSetSpawnerTypeWithEggEvent.patch @@ -43,7 +43,7 @@ index ac99265aacd4a28490705e3079ed04023fb1c54a..01f27e4aee9e257c632e9e163e495443 if (this.descriptionId == null) { this.descriptionId = Util.makeDescriptionId("entity", Registry.ENTITY_TYPE.getKey(this)); diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java -index ab7e4780529a88183600f3d3860e882bbe3a1754..fbe131ac0381c89cd297b5c2f7519f81aa565440 100644 +index 6afba641943717cc9c75420d9f3af1048543a17e..45e964a15a8afb85dd91638e800beaf0a6efdde9 100644 --- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java +++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java @@ -68,6 +68,15 @@ public class SpawnEggItem extends Item { diff --git a/patches/server/0018-EMC-MonsterEggSpawnEvent.patch b/patches/server/0019-EMC-MonsterEggSpawnEvent.patch similarity index 100% rename from patches/server/0018-EMC-MonsterEggSpawnEvent.patch rename to patches/server/0019-EMC-MonsterEggSpawnEvent.patch diff --git a/patches/server/0019-Player-invulnerabilities.patch b/patches/server/0020-Player-invulnerabilities.patch similarity index 91% rename from patches/server/0019-Player-invulnerabilities.patch rename to patches/server/0020-Player-invulnerabilities.patch index 57570b284..0cf7f5cee 100644 --- a/patches/server/0019-Player-invulnerabilities.patch +++ b/patches/server/0020-Player-invulnerabilities.patch @@ -5,18 +5,18 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86bddf88d3 100644 +index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e25a6a344 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -258,6 +258,7 @@ public class ServerPlayer extends Player { - public Integer clientViewDistance; +@@ -259,6 +259,7 @@ public class ServerPlayer extends Player { // CraftBukkit end public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper + public boolean purpurClient = false; // Purpur + public boolean acceptingResourcePack = false; // Purpur public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper -@@ -334,6 +335,7 @@ public class ServerPlayer extends Player { +@@ -335,6 +336,7 @@ public class ServerPlayer extends Player { this.bukkitPickUpLoot = true; this.maxHealthCache = this.getMaxHealth(); this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper @@ -24,7 +24,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86 } // Paper start - Chunk priority public BlockPos getPointInFront(double inFront) { -@@ -975,6 +977,12 @@ public class ServerPlayer extends Player { +@@ -976,6 +978,12 @@ public class ServerPlayer extends Player { } @@ -37,7 +37,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86 @Override public boolean hurt(DamageSource source, float amount) { if (this.isInvulnerableTo(source)) { -@@ -982,7 +990,7 @@ public class ServerPlayer extends Player { +@@ -983,7 +991,7 @@ public class ServerPlayer extends Player { } else { boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId); @@ -46,7 +46,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86 return false; } else { if (source instanceof EntityDamageSource) { -@@ -1157,6 +1165,7 @@ public class ServerPlayer extends Player { +@@ -1158,6 +1166,7 @@ public class ServerPlayer extends Player { } // Paper end @@ -54,7 +54,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86 return this; } } -@@ -1938,6 +1947,7 @@ public class ServerPlayer extends Player { +@@ -1939,6 +1948,7 @@ public class ServerPlayer extends Player { } public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) { @@ -62,7 +62,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86 this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt)); } -@@ -2421,9 +2431,17 @@ public class ServerPlayer extends Player { +@@ -2422,9 +2432,17 @@ public class ServerPlayer extends Player { @Override public boolean isImmobile() { @@ -82,7 +82,7 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86 public Scoreboard getScoreboard() { return this.getBukkitEntity().getScoreboard().getHandle(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 65fb15671ed2947bc62753bc685656732a96feff..858a0402a22e3c52d88b976bb513d0f82a60d114 100644 +index c6ef86206fc498a0fcd1c1527516d98e00a5df40..5ae1002dde94a242fd6c19bb22a52416eba229f2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1912,12 +1912,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -141,7 +141,7 @@ index dc3dcf7946d2b31784b31d31c01670b81e626eed..b1b2e96804eb9e736e634a75882dc404 public boolean babiesAreRidable = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d18a46745a82a758a3709ffa1de4b81bf4b75766..1d074ecc76eaf1ae10a6bd35b2f2a54f6654260e 100644 +index 5c9aa0e2e5a9e6a671fdc8d51f94529736b6dbbf..e9b440d1ec4a0c8155c80ee88e76b462a1bfdb06 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2565,5 +2565,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0020-Anvil-API.patch b/patches/server/0021-Anvil-API.patch similarity index 100% rename from patches/server/0020-Anvil-API.patch rename to patches/server/0021-Anvil-API.patch diff --git a/patches/server/0021-Configurable-villager-brain-ticks.patch b/patches/server/0022-Configurable-villager-brain-ticks.patch similarity index 100% rename from patches/server/0021-Configurable-villager-brain-ticks.patch rename to patches/server/0022-Configurable-villager-brain-ticks.patch diff --git a/patches/server/0022-Alternative-Keepalive-Handling.patch b/patches/server/0023-Alternative-Keepalive-Handling.patch similarity index 97% rename from patches/server/0022-Alternative-Keepalive-Handling.patch rename to patches/server/0023-Alternative-Keepalive-Handling.patch index 533c6e4d6..383e5a69c 100644 --- a/patches/server/0022-Alternative-Keepalive-Handling.patch +++ b/patches/server/0023-Alternative-Keepalive-Handling.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 858a0402a22e3c52d88b976bb513d0f82a60d114..4bc387482dfcecea079257e65e933ecd78951adc 100644 +index 5ae1002dde94a242fd6c19bb22a52416eba229f2..2f8bae1e9d744a28ec3fc0409622d4d500b8e2ca 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0023-Silk-touch-spawners.patch b/patches/server/0024-Silk-touch-spawners.patch similarity index 100% rename from patches/server/0023-Silk-touch-spawners.patch rename to patches/server/0024-Silk-touch-spawners.patch diff --git a/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0025-MC-168772-Fix-Add-turtle-egg-block-options.patch similarity index 100% rename from patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch rename to patches/server/0025-MC-168772-Fix-Add-turtle-egg-block-options.patch diff --git a/patches/server/0025-Fix-vanilla-command-permission-handler.patch b/patches/server/0026-Fix-vanilla-command-permission-handler.patch similarity index 95% rename from patches/server/0025-Fix-vanilla-command-permission-handler.patch rename to patches/server/0026-Fix-vanilla-command-permission-handler.patch index 6d30ce222..198a8d744 100644 --- a/patches/server/0025-Fix-vanilla-command-permission-handler.patch +++ b/patches/server/0026-Fix-vanilla-command-permission-handler.patch @@ -17,7 +17,7 @@ index 39708be1b445791b053023dec16ad7d4efcc9048..797c0c86c4a99e1608106881be849a33 public void removeCommand(String name) { this.children.remove(name); diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -index 2311819fc944c3ddb76efe59fd2920d4aca6b490..25c3fbc310f8f0292b26766601226531ad1200f4 100644 +index 0377c706c9aec6f367e83f859f9a3432ad5bba4a..96691990aa3ede953e41df6e3b36bb1eb1e3fd13 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java @@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand { diff --git a/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0027-Logger-settings-suppressing-pointless-logs.patch similarity index 100% rename from patches/server/0026-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0027-Logger-settings-suppressing-pointless-logs.patch diff --git a/patches/server/0027-Disable-outdated-build-check.patch b/patches/server/0028-Disable-outdated-build-check.patch similarity index 100% rename from patches/server/0027-Disable-outdated-build-check.patch rename to patches/server/0028-Disable-outdated-build-check.patch diff --git a/patches/server/0028-Giants-AI-settings.patch b/patches/server/0029-Giants-AI-settings.patch similarity index 100% rename from patches/server/0028-Giants-AI-settings.patch rename to patches/server/0029-Giants-AI-settings.patch diff --git a/patches/server/0029-Zombie-horse-naturally-spawn.patch b/patches/server/0030-Zombie-horse-naturally-spawn.patch similarity index 97% rename from patches/server/0029-Zombie-horse-naturally-spawn.patch rename to patches/server/0030-Zombie-horse-naturally-spawn.patch index 47fba097c..49c77ae6b 100644 --- a/patches/server/0029-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0030-Zombie-horse-naturally-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7c45fdbd9f389e8b74de5a672a9520ede93d6217..d53497ca3ada4c1205695f54dd7e163f3cc63afb 100644 +index 29b841462037fa97f72971c490b617d18be53160..fe963c666488a8a3463f855b0c87eee997f7a103 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -856,9 +856,15 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0030-Charged-creeper-naturally-spawn.patch b/patches/server/0031-Charged-creeper-naturally-spawn.patch similarity index 100% rename from patches/server/0030-Charged-creeper-naturally-spawn.patch rename to patches/server/0031-Charged-creeper-naturally-spawn.patch diff --git a/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch similarity index 100% rename from patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch rename to patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch diff --git a/patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0033-Dont-send-useless-entity-packets.patch b/patches/server/0034-Dont-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0033-Dont-send-useless-entity-packets.patch rename to patches/server/0034-Dont-send-useless-entity-packets.patch diff --git a/patches/server/0034-Tulips-change-fox-type.patch b/patches/server/0035-Tulips-change-fox-type.patch similarity index 100% rename from patches/server/0034-Tulips-change-fox-type.patch rename to patches/server/0035-Tulips-change-fox-type.patch diff --git a/patches/server/0035-Breedable-Polar-Bears.patch b/patches/server/0036-Breedable-Polar-Bears.patch similarity index 100% rename from patches/server/0035-Breedable-Polar-Bears.patch rename to patches/server/0036-Breedable-Polar-Bears.patch diff --git a/patches/server/0036-Chickens-can-retaliate.patch b/patches/server/0037-Chickens-can-retaliate.patch similarity index 97% rename from patches/server/0036-Chickens-can-retaliate.patch rename to patches/server/0037-Chickens-can-retaliate.patch index 930305129..d2e70a1da 100644 --- a/patches/server/0036-Chickens-can-retaliate.patch +++ b/patches/server/0037-Chickens-can-retaliate.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Chickens can retaliate diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java -index 55dccf338f9fba17fbcb88672d36b83e7bbec88b..eaec6eba96db3b8ce046208a4a1e5fc4b26b7dcc 100644 +index 9fe68301b9a6efd703fb9d2215a9cd3b2f017a4e..35cf6b9fb4d72df905d93bf52c02846b21b04007 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java @@ -66,6 +66,9 @@ public class Chicken extends Animal { diff --git a/patches/server/0037-Add-option-to-set-armorstand-step-height.patch b/patches/server/0038-Add-option-to-set-armorstand-step-height.patch similarity index 100% rename from patches/server/0037-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0038-Add-option-to-set-armorstand-step-height.patch diff --git a/patches/server/0038-Cat-spawning-options.patch b/patches/server/0039-Cat-spawning-options.patch similarity index 100% rename from patches/server/0038-Cat-spawning-options.patch rename to patches/server/0039-Cat-spawning-options.patch diff --git a/patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0040-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch similarity index 100% rename from patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch rename to patches/server/0040-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch diff --git a/patches/server/0040-Cows-eat-mushrooms.patch b/patches/server/0041-Cows-eat-mushrooms.patch similarity index 100% rename from patches/server/0040-Cows-eat-mushrooms.patch rename to patches/server/0041-Cows-eat-mushrooms.patch diff --git a/patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0042-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0042-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0042-Pigs-give-saddle-back.patch b/patches/server/0043-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0042-Pigs-give-saddle-back.patch rename to patches/server/0043-Pigs-give-saddle-back.patch diff --git a/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0044-Snowman-drop-and-put-back-pumpkin.patch similarity index 100% rename from patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch rename to patches/server/0044-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0044-Ender-dragon-always-drop-full-exp.patch b/patches/server/0045-Ender-dragon-always-drop-full-exp.patch similarity index 100% rename from patches/server/0044-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0045-Ender-dragon-always-drop-full-exp.patch diff --git a/patches/server/0045-Signs-editable-on-right-click.patch b/patches/server/0046-Signs-editable-on-right-click.patch similarity index 100% rename from patches/server/0045-Signs-editable-on-right-click.patch rename to patches/server/0046-Signs-editable-on-right-click.patch diff --git a/patches/server/0046-Signs-allow-color-codes.patch b/patches/server/0047-Signs-allow-color-codes.patch similarity index 95% rename from patches/server/0046-Signs-allow-color-codes.patch rename to patches/server/0047-Signs-allow-color-codes.patch index 23f0d6aab..febaadebf 100644 --- a/patches/server/0046-Signs-allow-color-codes.patch +++ b/patches/server/0047-Signs-allow-color-codes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index efa6e02ae06e70f554f21468ec3c2e86bddf88d3..d3277ade753b889ba4420ad68e3539d2f81699f2 100644 +index a53e68deb6b5fb9c43bce9444373b68e25a6a344..349aac496cf51f0a837d032d509364c13cece6ca 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1461,6 +1461,7 @@ public class ServerPlayer extends Player { +@@ -1462,6 +1462,7 @@ public class ServerPlayer extends Player { @Override public void openTextEdit(SignBlockEntity sign) { @@ -17,7 +17,7 @@ index efa6e02ae06e70f554f21468ec3c2e86bddf88d3..d3277ade753b889ba4420ad68e3539d2 this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos())); this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos())); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b9fc450c548e20d1f9763d993f3818235bec4bdb..0881cddd2a4c382b1d7113fe11a1c6a88be961bc 100644 +index 2f8bae1e9d744a28ec3fc0409622d4d500b8e2ca..cfc4bf12b9a276fc4b7a58638c577c978d63e2eb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3072,11 +3072,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0048-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 100% rename from patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0048-Allow-soil-to-moisten-from-water-directly-under-it.patch diff --git a/patches/server/0048-Minecart-settings-and-WASD-controls.patch b/patches/server/0049-Minecart-settings-and-WASD-controls.patch similarity index 98% rename from patches/server/0048-Minecart-settings-and-WASD-controls.patch rename to patches/server/0049-Minecart-settings-and-WASD-controls.patch index 187e7eba5..dcc6cb352 100644 --- a/patches/server/0048-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0049-Minecart-settings-and-WASD-controls.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d3277ade753b889ba4420ad68e3539d2f81699f2..394da2bb29809477351da3cb782bf5b8e3aadc3b 100644 +index 349aac496cf51f0a837d032d509364c13cece6ca..edaff3eb46fd1de456acbc465d644ac9454022d3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -988,6 +988,7 @@ public class ServerPlayer extends Player { +@@ -989,6 +989,7 @@ public class ServerPlayer extends Player { if (this.isInvulnerableTo(source)) { return false; } else { diff --git a/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0050-Disable-loot-drops-on-death-by-cramming.patch similarity index 100% rename from patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0050-Disable-loot-drops-on-death-by-cramming.patch diff --git a/patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch similarity index 100% rename from patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch diff --git a/patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0052-Fix-the-dead-lagging-the-server.patch b/patches/server/0053-Fix-the-dead-lagging-the-server.patch similarity index 94% rename from patches/server/0052-Fix-the-dead-lagging-the-server.patch rename to patches/server/0053-Fix-the-dead-lagging-the-server.patch index af6883484..727992801 100644 --- a/patches/server/0052-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0053-Fix-the-dead-lagging-the-server.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1d6e063e1cf5435b123d5789d7fcf03503cc0821..46b6e0fcf662472b7fcccc33f859c5e33340d7bb 100644 +index 9b6ee1fc3fd17faf2c2be56c0c292b1d5f98e0fa..24f4c130a539b3a42bf13f9bd4d264f9c84dec3b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1735,6 +1735,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0053-Skip-events-if-there-s-no-listeners.patch b/patches/server/0054-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0053-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0054-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0054-Add-permission-for-F3-N-debug.patch b/patches/server/0055-Add-permission-for-F3-N-debug.patch similarity index 100% rename from patches/server/0054-Add-permission-for-F3-N-debug.patch rename to patches/server/0055-Add-permission-for-F3-N-debug.patch diff --git a/patches/server/0055-Configurable-TPS-Catchup.patch b/patches/server/0056-Configurable-TPS-Catchup.patch similarity index 100% rename from patches/server/0055-Configurable-TPS-Catchup.patch rename to patches/server/0056-Configurable-TPS-Catchup.patch diff --git a/patches/server/0056-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 100% rename from patches/server/0056-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch diff --git a/patches/server/0057-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch similarity index 100% rename from patches/server/0057-Add-enderman-and-creeper-griefing-controls.patch rename to patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch diff --git a/patches/server/0058-Villagers-follow-emerald-blocks.patch b/patches/server/0059-Villagers-follow-emerald-blocks.patch similarity index 100% rename from patches/server/0058-Villagers-follow-emerald-blocks.patch rename to patches/server/0059-Villagers-follow-emerald-blocks.patch diff --git a/patches/server/0059-Allow-leashing-villagers.patch b/patches/server/0060-Allow-leashing-villagers.patch similarity index 100% rename from patches/server/0059-Allow-leashing-villagers.patch rename to patches/server/0060-Allow-leashing-villagers.patch diff --git a/patches/server/0060-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0060-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0061-Implement-infinite-lava.patch b/patches/server/0062-Implement-infinite-lava.patch similarity index 100% rename from patches/server/0061-Implement-infinite-lava.patch rename to patches/server/0062-Implement-infinite-lava.patch diff --git a/patches/server/0062-Make-lava-flow-speed-configurable.patch b/patches/server/0063-Make-lava-flow-speed-configurable.patch similarity index 100% rename from patches/server/0062-Make-lava-flow-speed-configurable.patch rename to patches/server/0063-Make-lava-flow-speed-configurable.patch diff --git a/patches/server/0063-Add-player-death-exp-control-options.patch b/patches/server/0064-Add-player-death-exp-control-options.patch similarity index 100% rename from patches/server/0063-Add-player-death-exp-control-options.patch rename to patches/server/0064-Add-player-death-exp-control-options.patch diff --git a/patches/server/0064-Configurable-void-damage-height-and-damage.patch b/patches/server/0065-Configurable-void-damage-height-and-damage.patch similarity index 97% rename from patches/server/0064-Configurable-void-damage-height-and-damage.patch rename to patches/server/0065-Configurable-void-damage-height-and-damage.patch index abca16b81..a3e8c5325 100644 --- a/patches/server/0064-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0065-Configurable-void-damage-height-and-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 46b6e0fcf662472b7fcccc33f859c5e33340d7bb..5a23bc98f38e715ee16abe9a370b044e928b2d03 100644 +index 24f4c130a539b3a42bf13f9bd4d264f9c84dec3b..ad8497df1b0410989afd22d65e6afd0e72b0926f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -767,7 +767,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0065-Add-canSaveToDisk-to-Entity.patch b/patches/server/0066-Add-canSaveToDisk-to-Entity.patch similarity index 95% rename from patches/server/0065-Add-canSaveToDisk-to-Entity.patch rename to patches/server/0066-Add-canSaveToDisk-to-Entity.patch index 0aea78cad..a0a1bbb65 100644 --- a/patches/server/0065-Add-canSaveToDisk-to-Entity.patch +++ b/patches/server/0066-Add-canSaveToDisk-to-Entity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add canSaveToDisk to Entity diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5a23bc98f38e715ee16abe9a370b044e928b2d03..6db330cf388ef80f3acb84e41f02063c36f9aaf2 100644 +index ad8497df1b0410989afd22d65e6afd0e72b0926f..35de254dfb565b75286fc130573b8d788dce1982 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4264,5 +4264,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -35,7 +35,7 @@ index f52420f27f51d9dbf214f96a0530c0f17f2bc5fc..12cd1b453150e098975c34e00ec9277f skull.setPosRaw(headX, headY, headZ); level.addFreshEntity(skull); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java -index 69ac9ed94b1890f9bd5ba21cdfe31e42529274e1..7ee8272b40d5c1dcd45a948e1a72063c8106ea5f 100644 +index 396c34c0866bf395b4d86361d96fe103c5d9ae7e..320291b611cbb243a54ea882b16d70d061d21492 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java @@ -92,6 +92,7 @@ public class EntityStorage implements EntityPersistentStorage { diff --git a/patches/server/0066-Dispenser-curse-of-binding-protection.patch b/patches/server/0067-Dispenser-curse-of-binding-protection.patch similarity index 100% rename from patches/server/0066-Dispenser-curse-of-binding-protection.patch rename to patches/server/0067-Dispenser-curse-of-binding-protection.patch diff --git a/patches/server/0067-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch similarity index 100% rename from patches/server/0067-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch diff --git a/patches/server/0068-Mending-mends-most-damages-equipment-first.patch b/patches/server/0069-Mending-mends-most-damages-equipment-first.patch similarity index 100% rename from patches/server/0068-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0069-Mending-mends-most-damages-equipment-first.patch diff --git a/patches/server/0069-Add-5-second-tps-average-in-tps.patch b/patches/server/0070-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0069-Add-5-second-tps-average-in-tps.patch rename to patches/server/0070-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0070-Implement-elytra-settings.patch b/patches/server/0071-Implement-elytra-settings.patch similarity index 100% rename from patches/server/0070-Implement-elytra-settings.patch rename to patches/server/0071-Implement-elytra-settings.patch diff --git a/patches/server/0071-Item-entity-immunities.patch b/patches/server/0072-Item-entity-immunities.patch similarity index 96% rename from patches/server/0071-Item-entity-immunities.patch rename to patches/server/0072-Item-entity-immunities.patch index df5d3da21..ba5f95661 100644 --- a/patches/server/0071-Item-entity-immunities.patch +++ b/patches/server/0072-Item-entity-immunities.patch @@ -31,7 +31,7 @@ index b7116c40b22c4c614ba74232a18c216da8cba94c..f9c37b2ca0d1b8415dc32127650f449e public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer> consumer, Set trackedPlayers) { this.trackedPlayers = trackedPlayers; diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7fbbfccf90 100644 +index 158719d46c96bb733a00e08c8285f41a48406abf..22d5f7e543461461ba0560f3fcfb769a8f082dce 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java @@ -53,6 +53,12 @@ public class ItemEntity extends Entity { @@ -77,7 +77,7 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f } @Override -@@ -594,4 +616,15 @@ public class ItemEntity extends Entity { +@@ -594,4 +616,17 @@ public class ItemEntity extends Entity { public SoundSource getSoundSource() { return SoundSource.AMBIENT; } @@ -87,8 +87,10 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f + Packet spawnPacket = new ClientboundAddEntityPacket(this); + Packet metadataPacket = new net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket(getId(), getEntityData(), true); + for (net.minecraft.server.network.ServerPlayerConnection connection : this.tracker.serverEntity.trackedPlayers) { -+ connection.send(spawnPacket); -+ connection.send(metadataPacket); ++ if (!connection.getPlayer().purpurClient) { ++ connection.send(spawnPacket); ++ connection.send(metadataPacket); ++ } + } + } + // Purpur end diff --git a/patches/server/0072-Add-ping-command.patch b/patches/server/0073-Add-ping-command.patch similarity index 97% rename from patches/server/0072-Add-ping-command.patch rename to patches/server/0073-Add-ping-command.patch index c0dbd2b68..385e6ca93 100644 --- a/patches/server/0072-Add-ping-command.patch +++ b/patches/server/0073-Add-ping-command.patch @@ -17,7 +17,7 @@ index 59881c845cc88508736cc3d2a61860512d28964d..3a1e1ff3c9154db6b1b23d1898c8e6ec if (environment.includeIntegrated) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 66745b2c1c38391779abb496933c74466379aef2..cf3d30f19a6184686ea224e976dd14dfab5db101 100644 +index 03b88ddc349fc7cfa48573ec93c22cd9cef3b58d..8f84848950c2bab5123766edd6131e98be97a92a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -162,12 +162,14 @@ public class PurpurConfig { diff --git a/patches/server/0073-Add-demo-command.patch b/patches/server/0074-Add-demo-command.patch similarity index 97% rename from patches/server/0073-Add-demo-command.patch rename to patches/server/0074-Add-demo-command.patch index 0a2010f09..e2b4a8845 100644 --- a/patches/server/0073-Add-demo-command.patch +++ b/patches/server/0074-Add-demo-command.patch @@ -17,7 +17,7 @@ index 3a1e1ff3c9154db6b1b23d1898c8e6ec198f103f..880efd832a2029bdb7a404e27797b316 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index cf3d30f19a6184686ea224e976dd14dfab5db101..2f5ee21b94c3f0fbe1febf0b8878b35aef88dae0 100644 +index 8f84848950c2bab5123766edd6131e98be97a92a..72cfd435cc68ee42ea28b0afc5b42c75e1e2813a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -162,6 +162,7 @@ public class PurpurConfig { diff --git a/patches/server/0074-Add-credits-command.patch b/patches/server/0075-Add-credits-command.patch similarity index 97% rename from patches/server/0074-Add-credits-command.patch rename to patches/server/0075-Add-credits-command.patch index e5f8846ac..ceede018a 100644 --- a/patches/server/0074-Add-credits-command.patch +++ b/patches/server/0075-Add-credits-command.patch @@ -17,7 +17,7 @@ index 880efd832a2029bdb7a404e27797b316cbbe5703..a5712108fbbe5ddc61cdfd390f667ab0 net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 2f5ee21b94c3f0fbe1febf0b8878b35aef88dae0..4950ade071fb401326aeb4075f5a2a5ab65d4d52 100644 +index 72cfd435cc68ee42ea28b0afc5b42c75e1e2813a..35be2f773d33b1c13f8732217c5520b384305b18 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -162,6 +162,7 @@ public class PurpurConfig { diff --git a/patches/server/0075-Configurable-jockey-options.patch b/patches/server/0076-Configurable-jockey-options.patch similarity index 98% rename from patches/server/0075-Configurable-jockey-options.patch rename to patches/server/0076-Configurable-jockey-options.patch index a782fde94..ce7f46a5c 100644 --- a/patches/server/0075-Configurable-jockey-options.patch +++ b/patches/server/0076-Configurable-jockey-options.patch @@ -57,7 +57,7 @@ index 464e062bba03a17c9281b3dfb8fa9193c1b81150..6c89eabddda16f9b72e6062c31bb4be6 public static boolean checkHuskSpawnRules(EntityType type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) { diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index 3b7e261eae87445387f5a34d6fbb420c4cd0cf0f..f6e33ca1933792a3a417f54d20fea8dc4a41c1b5 100644 +index c3288e6a5be2c0805067fe14496315afd6156110..1f9a233799be988748f6146ced2a4489899079f8 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -122,6 +122,18 @@ public class Zombie extends Monster { @@ -115,7 +115,7 @@ index 3b7e261eae87445387f5a34d6fbb420c4cd0cf0f..f6e33ca1933792a3a417f54d20fea8dc } } diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java -index ce15ebc6248eaa849ccb1de4319b51e8a12f2e3e..8c71bf52cebf4b7825c770b120e6ac7b2ee916fb 100644 +index 9c60e3b3e62a29d6898c82a4110ffd4d1c7cb5f2..7fda07f5fa756077dab59de95f15b9197e09581a 100644 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java @@ -94,6 +94,21 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder { diff --git a/patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from patches/server/0076-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/patches/server/0077-Add-phantom-spawning-options.patch b/patches/server/0078-Add-phantom-spawning-options.patch similarity index 100% rename from patches/server/0077-Add-phantom-spawning-options.patch rename to patches/server/0078-Add-phantom-spawning-options.patch diff --git a/patches/server/0078-Implement-bed-explosion-options.patch b/patches/server/0079-Implement-bed-explosion-options.patch similarity index 100% rename from patches/server/0078-Implement-bed-explosion-options.patch rename to patches/server/0079-Implement-bed-explosion-options.patch diff --git a/patches/server/0079-Implement-respawn-anchor-explosion-options.patch b/patches/server/0080-Implement-respawn-anchor-explosion-options.patch similarity index 100% rename from patches/server/0079-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0080-Implement-respawn-anchor-explosion-options.patch diff --git a/patches/server/0080-Add-allow-water-in-end-world-option.patch b/patches/server/0081-Add-allow-water-in-end-world-option.patch similarity index 100% rename from patches/server/0080-Add-allow-water-in-end-world-option.patch rename to patches/server/0081-Add-allow-water-in-end-world-option.patch diff --git a/patches/server/0081-Allow-color-codes-in-books.patch b/patches/server/0082-Allow-color-codes-in-books.patch similarity index 97% rename from patches/server/0081-Allow-color-codes-in-books.patch rename to patches/server/0082-Allow-color-codes-in-books.patch index a690b276c..fddff5b7c 100644 --- a/patches/server/0081-Allow-color-codes-in-books.patch +++ b/patches/server/0082-Allow-color-codes-in-books.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0fbf66540e6beee964096a8f2a0312509449ff14..547572a579c434055956eab627195dbb5e5d4fa8 100644 +index cfc4bf12b9a276fc4b7a58638c577c978d63e2eb..a4e38e61138b2bfeee30a76e1f0e199d79bedfe9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1200,13 +1200,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0082-Entity-lifespan.patch b/patches/server/0083-Entity-lifespan.patch similarity index 100% rename from patches/server/0082-Entity-lifespan.patch rename to patches/server/0083-Entity-lifespan.patch diff --git a/patches/server/0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 96% rename from patches/server/0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 68a1a8cd0..797eb1147 100644 --- a/patches/server/0083-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 92be3472f97a8d3e916af198c1278773aa1b7d3a..074abae3d83c3f170b1d4e5134a204c7acdc49bc 100644 +index edaff3eb46fd1de456acbc465d644ac9454022d3..48bad15686c38c02d2c933c6360edf7a90950039 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2490,5 +2490,25 @@ public class ServerPlayer extends Player { +@@ -2491,5 +2491,25 @@ public class ServerPlayer extends Player { } // CraftBukkit end diff --git a/patches/server/0084-Squid-EAR-immunity.patch b/patches/server/0085-Squid-EAR-immunity.patch similarity index 100% rename from patches/server/0084-Squid-EAR-immunity.patch rename to patches/server/0085-Squid-EAR-immunity.patch diff --git a/patches/server/0085-Configurable-feature-seed-settings.patch b/patches/server/0086-Configurable-feature-seed-settings.patch similarity index 99% rename from patches/server/0085-Configurable-feature-seed-settings.patch rename to patches/server/0086-Configurable-feature-seed-settings.patch index 8dcd8155c..87e0dbb45 100644 --- a/patches/server/0085-Configurable-feature-seed-settings.patch +++ b/patches/server/0086-Configurable-feature-seed-settings.patch @@ -835,7 +835,7 @@ index ed3944a60d09495eb424dd11d00e8c3585177d51..fcf25cc905ece0213a0eb6365a0a5756 return false; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 86f4f92ee15fa2320da0a75bb515e711315aa3a9..85f323b2b1be900ee1d7416b5dd9877bbb282460 100644 +index 3bfddb1111f543a5badb26ca52b4dcef32a7cf1a..f8aeba21a04bcf3cc6c63bcf99ea3b5c2773741a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -176,6 +176,128 @@ public class PurpurConfig { diff --git a/patches/server/0086-Phantoms-burn-in-light.patch b/patches/server/0087-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0086-Phantoms-burn-in-light.patch rename to patches/server/0087-Phantoms-burn-in-light.patch diff --git a/patches/server/0087-Configurable-villager-breeding.patch b/patches/server/0088-Configurable-villager-breeding.patch similarity index 100% rename from patches/server/0087-Configurable-villager-breeding.patch rename to patches/server/0088-Configurable-villager-breeding.patch diff --git a/patches/server/0088-Redstone-deactivates-spawners.patch b/patches/server/0089-Redstone-deactivates-spawners.patch similarity index 100% rename from patches/server/0088-Redstone-deactivates-spawners.patch rename to patches/server/0089-Redstone-deactivates-spawners.patch diff --git a/patches/server/0089-Totems-work-in-inventory.patch b/patches/server/0090-Totems-work-in-inventory.patch similarity index 100% rename from patches/server/0089-Totems-work-in-inventory.patch rename to patches/server/0090-Totems-work-in-inventory.patch diff --git a/patches/server/0090-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch similarity index 100% rename from patches/server/0090-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0091-Add-vindicator-johnny-spawn-chance.patch diff --git a/patches/server/0091-Add-option-to-disable-certain-block-updates.patch b/patches/server/0092-Add-option-to-disable-certain-block-updates.patch similarity index 100% rename from patches/server/0091-Add-option-to-disable-certain-block-updates.patch rename to patches/server/0092-Add-option-to-disable-certain-block-updates.patch diff --git a/patches/server/0092-Dispensers-place-anvils-option.patch b/patches/server/0093-Dispensers-place-anvils-option.patch similarity index 100% rename from patches/server/0092-Dispensers-place-anvils-option.patch rename to patches/server/0093-Dispensers-place-anvils-option.patch diff --git a/patches/server/0093-Allow-anvil-colors.patch b/patches/server/0094-Allow-anvil-colors.patch similarity index 100% rename from patches/server/0093-Allow-anvil-colors.patch rename to patches/server/0094-Allow-anvil-colors.patch diff --git a/patches/server/0094-Add-no-random-tick-block-list.patch b/patches/server/0095-Add-no-random-tick-block-list.patch similarity index 97% rename from patches/server/0094-Add-no-random-tick-block-list.patch rename to patches/server/0095-Add-no-random-tick-block-list.patch index 82164ec8b..0f9c0596a 100644 --- a/patches/server/0094-Add-no-random-tick-block-list.patch +++ b/patches/server/0095-Add-no-random-tick-block-list.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add no-random-tick block list diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index d53497ca3ada4c1205695f54dd7e163f3cc63afb..5316b5e9bfe57caed88a3ff38715e67ffd59df33 100644 +index fe963c666488a8a3463f855b0c87eee997f7a103..7284003a17e8059c3c3ab8a2c8a62b0f53f48ac4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -483,7 +483,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0095-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0095-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0096-Short-enderman-height.patch b/patches/server/0097-Short-enderman-height.patch similarity index 100% rename from patches/server/0096-Short-enderman-height.patch rename to patches/server/0097-Short-enderman-height.patch diff --git a/patches/server/0097-Stop-squids-floating-on-top-of-water.patch b/patches/server/0098-Stop-squids-floating-on-top-of-water.patch similarity index 97% rename from patches/server/0097-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0098-Stop-squids-floating-on-top-of-water.patch index 01a1face4..fb810ee6e 100644 --- a/patches/server/0097-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0098-Stop-squids-floating-on-top-of-water.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6db330cf388ef80f3acb84e41f02063c36f9aaf2..c5a1e46cc01e0f296a02536e70dc1443bb23a26f 100644 +index 35de254dfb565b75286fc130573b8d788dce1982..d3541a447d7fcee70733ce9b18f4c5abdc4ba55a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3829,11 +3829,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0098-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0099-Use-configured-height-for-nether-surface-builders.patch similarity index 100% rename from patches/server/0098-Use-configured-height-for-nether-surface-builders.patch rename to patches/server/0099-Use-configured-height-for-nether-surface-builders.patch diff --git a/patches/server/0099-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch similarity index 100% rename from patches/server/0099-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch diff --git a/patches/server/0100-Entities-can-use-portals-configuration.patch b/patches/server/0101-Entities-can-use-portals-configuration.patch similarity index 96% rename from patches/server/0100-Entities-can-use-portals-configuration.patch rename to patches/server/0101-Entities-can-use-portals-configuration.patch index a914638e6..79c03a7a3 100644 --- a/patches/server/0100-Entities-can-use-portals-configuration.patch +++ b/patches/server/0101-Entities-can-use-portals-configuration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c5a1e46cc01e0f296a02536e70dc1443bb23a26f..63ab08c00048feba74e4b3c25308ee75d2aa8474 100644 +index d3541a447d7fcee70733ce9b18f4c5abdc4ba55a..af932a7149153a295c52efb7d7ea6da9a936b4ea 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2701,7 +2701,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0101-LivingEntity-broadcastItemBreak.patch b/patches/server/0102-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/server/0101-LivingEntity-broadcastItemBreak.patch rename to patches/server/0102-LivingEntity-broadcastItemBreak.patch diff --git a/patches/server/0102-Customizable-wither-health-and-healing.patch b/patches/server/0103-Customizable-wither-health-and-healing.patch similarity index 100% rename from patches/server/0102-Customizable-wither-health-and-healing.patch rename to patches/server/0103-Customizable-wither-health-and-healing.patch diff --git a/patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch similarity index 98% rename from patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch index 76d3a1cd5..17ccae176 100644 --- a/patches/server/0103-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5316b5e9bfe57caed88a3ff38715e67ffd59df33..7944a33cf36878c9e4853637bfb9cba22ba8bc4d 100644 +index 7284003a17e8059c3c3ab8a2c8a62b0f53f48ac4..51aa1f9e0ac5ea0763d1a7209cd5a22507c56cb2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -83,6 +83,7 @@ import net.minecraft.world.entity.MobCategory; diff --git a/patches/server/0104-Raid-cooldown-setting.patch b/patches/server/0105-Raid-cooldown-setting.patch similarity index 100% rename from patches/server/0104-Raid-cooldown-setting.patch rename to patches/server/0105-Raid-cooldown-setting.patch diff --git a/patches/server/0105-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch similarity index 100% rename from patches/server/0105-Despawn-rate-config-options-per-projectile-type.patch rename to patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch diff --git a/patches/server/0106-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 98% rename from patches/server/0106-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch index 38dbcd1a6..d490ded02 100644 --- a/patches/server/0106-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -46,7 +46,7 @@ index 7d28a410ae18594b5db4559640b4eb30762f5a69..8d3ce6c97a8734c0d13844cafca251a3 this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Axolotl.class, true, false)); this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR)); diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java -index f6e33ca1933792a3a417f54d20fea8dc4a41c1b5..7eed6c176345c766a99d4304d61d28354291960f 100644 +index 1f9a233799be988748f6146ced2a4489899079f8..1f90c40c5e92232c38a33097903fd6e2f6f2ff02 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java @@ -152,7 +152,19 @@ public class Zombie extends Monster { diff --git a/patches/server/0107-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch similarity index 100% rename from patches/server/0107-Persistent-TileEntity-Lore-and-DisplayName.patch rename to patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch diff --git a/patches/server/0108-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0108-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0109-Flying-squids-Oh-my.patch b/patches/server/0110-Flying-squids-Oh-my.patch similarity index 100% rename from patches/server/0109-Flying-squids-Oh-my.patch rename to patches/server/0110-Flying-squids-Oh-my.patch diff --git a/patches/server/0110-Infinity-bow-settings.patch b/patches/server/0111-Infinity-bow-settings.patch similarity index 100% rename from patches/server/0110-Infinity-bow-settings.patch rename to patches/server/0111-Infinity-bow-settings.patch diff --git a/patches/server/0111-Stonecutter-damage.patch b/patches/server/0112-Stonecutter-damage.patch similarity index 97% rename from patches/server/0111-Stonecutter-damage.patch rename to patches/server/0112-Stonecutter-damage.patch index e7474106b..1afbddd20 100644 --- a/patches/server/0111-Stonecutter-damage.patch +++ b/patches/server/0112-Stonecutter-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stonecutter damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 63ab08c00048feba74e4b3c25308ee75d2aa8474..ad691bd5c17ef7a8ecb394d620e02b28ac08f5a4 100644 +index af932a7149153a295c52efb7d7ea6da9a936b4ea..bd9293161dd28153d102718720b8f8a3c54536ad 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1001,7 +1001,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0112-Configurable-daylight-cycle.patch b/patches/server/0113-Configurable-daylight-cycle.patch similarity index 98% rename from patches/server/0112-Configurable-daylight-cycle.patch rename to patches/server/0113-Configurable-daylight-cycle.patch index 0a66c058b..48dca75b6 100644 --- a/patches/server/0112-Configurable-daylight-cycle.patch +++ b/patches/server/0113-Configurable-daylight-cycle.patch @@ -18,7 +18,7 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) { this.gameTime = time % 192000; // Paper - fix guardian beam diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7944a33cf36878c9e4853637bfb9cba22ba8bc4d..3bc63f24bf8c07b89562887bdc8cf7569d7b33b4 100644 +index 51aa1f9e0ac5ea0763d1a7209cd5a22507c56cb2..239bb3f470fe1b323a7fbad622fcff05cb23cc31 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -196,6 +196,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0113-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch similarity index 100% rename from patches/server/0113-Allow-infinite-and-mending-enchantments-together.patch rename to patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch diff --git a/patches/server/0114-Furnace-uses-lava-from-underneath.patch b/patches/server/0115-Furnace-uses-lava-from-underneath.patch similarity index 100% rename from patches/server/0114-Furnace-uses-lava-from-underneath.patch rename to patches/server/0115-Furnace-uses-lava-from-underneath.patch diff --git a/patches/server/0115-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0116-Arrows-should-not-reset-despawn-counter.patch similarity index 100% rename from patches/server/0115-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0116-Arrows-should-not-reset-despawn-counter.patch diff --git a/patches/server/0116-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch similarity index 100% rename from patches/server/0116-Ability-to-re-add-farmland-mechanics-from-Alpha.patch rename to patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch diff --git a/patches/server/0117-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch similarity index 98% rename from patches/server/0117-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch index 657b3d7cb..08fb9d572 100644 --- a/patches/server/0117-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add adjustable breeding cooldown to config diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java -index 5a503a255b4e7e684a8f42d8190430397ca81683..7a90c6a628571730eee382e1efcfe1b90a5ecfc5 100644 +index 43841b5c77beb73169e2ff1645afe1234d8f74c7..d5d9f8e9c7119ae159a085aa414fc7f303be72a5 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Animal.java +++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java @@ -145,7 +145,7 @@ public abstract class Animal extends AgeableMob { diff --git a/patches/server/0118-Make-entity-breeding-times-configurable.patch b/patches/server/0119-Make-entity-breeding-times-configurable.patch similarity index 100% rename from patches/server/0118-Make-entity-breeding-times-configurable.patch rename to patches/server/0119-Make-entity-breeding-times-configurable.patch diff --git a/patches/server/0119-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch similarity index 99% rename from patches/server/0119-Apply-display-names-from-item-forms-of-entities-to-e.patch rename to patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch index 63edcb307..a5698cb41 100644 --- a/patches/server/0119-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -117,7 +117,7 @@ index c0864c833fd313e6ba9339ecc7f9e2359954bda3..8f5ed444ab430ae60d52e68ded605cfa return InteractionResultHolder.fail(itemstack); } else { diff --git a/src/main/java/net/minecraft/world/item/HangingEntityItem.java b/src/main/java/net/minecraft/world/item/HangingEntityItem.java -index 282bfe4904637aaff1bd29e30ed18ba843c07cab..ddd50db8bb92c147d7c1eef4d1df3ac53e2d3e4b 100644 +index e5b042f2445eb06fb8075ba539c836595814fa14..8cdede6a9698d6c99b4f08edc2a3403fec854f66 100644 --- a/src/main/java/net/minecraft/world/item/HangingEntityItem.java +++ b/src/main/java/net/minecraft/world/item/HangingEntityItem.java @@ -40,7 +40,7 @@ public class HangingEntityItem extends Item { diff --git a/patches/server/0120-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch similarity index 100% rename from patches/server/0120-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch rename to patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch diff --git a/patches/server/0121-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch similarity index 100% rename from patches/server/0121-Add-twisting-and-weeping-vines-growth-rates.patch rename to patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch diff --git a/patches/server/0122-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch similarity index 100% rename from patches/server/0122-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch rename to patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch diff --git a/patches/server/0123-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch similarity index 100% rename from patches/server/0123-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch rename to patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch diff --git a/patches/server/0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch similarity index 97% rename from patches/server/0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch rename to patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch index 814eba92e..330fa6c9a 100644 --- a/patches/server/0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch +++ b/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch @@ -33,7 +33,7 @@ index 52d43c2bf1fa1bfa97aab02a9837c6b11ecafc9d..d57a1984328750f5a6db748ef2db21fb if (flag5) { if (i > 0) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index fc392aaf818db1db15ed68620d6c670fe69534e2..2187e7f35d055ed79a9873e4d5298aaa2faf2d58 100644 +index 5338d1638988c6fdd855eb9acf4fb7f6d4eaa498..7f38e0ea4de15486cd96cd1f5ae0b4f41a91a06f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -967,7 +967,7 @@ public class CraftEventFactory { diff --git a/patches/server/0125-Add-configurable-snowball-damage.patch b/patches/server/0126-Add-configurable-snowball-damage.patch similarity index 100% rename from patches/server/0125-Add-configurable-snowball-damage.patch rename to patches/server/0126-Add-configurable-snowball-damage.patch diff --git a/patches/server/0126-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch similarity index 100% rename from patches/server/0126-Zombie-break-door-minimum-difficulty-option.patch rename to patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch diff --git a/patches/server/0127-Left-handed-API.patch b/patches/server/0128-Left-handed-API.patch similarity index 100% rename from patches/server/0127-Left-handed-API.patch rename to patches/server/0128-Left-handed-API.patch diff --git a/patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch similarity index 100% rename from patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch rename to patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch diff --git a/patches/server/0129-Add-boat-fall-damage-config.patch b/patches/server/0130-Add-boat-fall-damage-config.patch similarity index 95% rename from patches/server/0129-Add-boat-fall-damage-config.patch rename to patches/server/0130-Add-boat-fall-damage-config.patch index 483868ffb..aec6247c3 100644 --- a/patches/server/0129-Add-boat-fall-damage-config.patch +++ b/patches/server/0130-Add-boat-fall-damage-config.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 074abae3d83c3f170b1d4e5134a204c7acdc49bc..b520d4980180462628ede1383ee1826bbd6a6ad2 100644 +index 48bad15686c38c02d2c933c6360edf7a90950039..7684f55d2f9f85c14763dfa4fc4c4dc49711b841 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -988,7 +988,16 @@ public class ServerPlayer extends Player { +@@ -989,7 +989,16 @@ public class ServerPlayer extends Player { if (this.isInvulnerableTo(source)) { return false; } else { diff --git a/patches/server/0130-Snow-Golem-rate-of-fire-config.patch b/patches/server/0131-Snow-Golem-rate-of-fire-config.patch similarity index 97% rename from patches/server/0130-Snow-Golem-rate-of-fire-config.patch rename to patches/server/0131-Snow-Golem-rate-of-fire-config.patch index 2e8758199..e46d4e6b8 100644 --- a/patches/server/0130-Snow-Golem-rate-of-fire-config.patch +++ b/patches/server/0131-Snow-Golem-rate-of-fire-config.patch @@ -10,7 +10,7 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to 0, snow golems won't shoot any snowballs. diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java -index 0733f9c057fef17fd79a4769f19b78f4c83a7784..1697b573ffd0c5d17d2d538c40f5ce4b709f261a 100644 +index ee64f4084b25d77f1c25b76a5b7d90cd2547bffb..5e370d5137564ddcfb76a81b92d43e254f4a0ac4 100644 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java @@ -73,7 +73,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM diff --git a/patches/server/0131-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch similarity index 90% rename from patches/server/0131-PaperPR-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch index 604385261..ffdd9f9b4 100644 --- a/patches/server/0131-PaperPR-Config-option-for-Piglins-guarding-chests.patch +++ b/patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Config option for Piglins guarding chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f65e3b51e876f7a3d30710eed56fdca4daa620c9..7a3b994ab30597d46753ebe2b78e07a3e9bfb47f 100644 +index c334f29c69c1e6e3fe55cd6695e7df400cf36058..cad6b4479ad3ab9e2e4bb3a733a66e4a2598dc90 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -54,6 +54,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index f65e3b51e876f7a3d30710eed56fdca4daa620c9..7a3b994ab30597d46753ebe2b78e07a3 private void useEigencraftRedstone() { useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", false); diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java -index 01d307e0022656509bc8fd02d6bac78a6af3a7be..2366735f571113a543fd15607b5ff74c09cd0d24 100644 +index 4330ccefe92c76a516f42a81b38536cf3312be5b..7fa5cde9c26c21d4d800f720f373a8b702f4fcb5 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java @@ -468,6 +468,7 @@ public class PiglinAi { diff --git a/patches/server/0132-EMC-Configurable-disable-give-dropping.patch b/patches/server/0133-EMC-Configurable-disable-give-dropping.patch similarity index 100% rename from patches/server/0132-EMC-Configurable-disable-give-dropping.patch rename to patches/server/0133-EMC-Configurable-disable-give-dropping.patch diff --git a/patches/server/0133-Lobotomize-stuck-villagers.patch b/patches/server/0134-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0133-Lobotomize-stuck-villagers.patch rename to patches/server/0134-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 100% rename from patches/server/0134-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch diff --git a/patches/server/0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 100% rename from patches/server/0135-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch diff --git a/patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch similarity index 96% rename from patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch rename to patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch index 03075fdb3..07bb46559 100644 --- a/patches/server/0136-Spread-out-and-optimise-player-list-ticksSpread-out-.patch +++ b/patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch @@ -46,7 +46,7 @@ index 1d89441b6d650691aef4bbbb714cee1f3d73774a..29043f9354b29f7766f1d6d8e793e2ea public void broadcastAll(Packet packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1d074ecc76eaf1ae10a6bd35b2f2a54f6654260e..d38d724cd024bec0554b078b0c7fd479a51dd736 100644 +index e9b440d1ec4a0c8155c80ee88e76b462a1bfdb06..61194cb8aa88f8cf2eb7da1c6ac17d94a5c02355 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1564,7 +1564,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0137-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 100% rename from patches/server/0137-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch diff --git a/patches/server/0138-Configurable-default-wolf-collar-color.patch b/patches/server/0139-Configurable-default-wolf-collar-color.patch similarity index 100% rename from patches/server/0138-Configurable-default-wolf-collar-color.patch rename to patches/server/0139-Configurable-default-wolf-collar-color.patch diff --git a/patches/server/0139-Phantom-flames-on-swoop.patch b/patches/server/0140-Phantom-flames-on-swoop.patch similarity index 100% rename from patches/server/0139-Phantom-flames-on-swoop.patch rename to patches/server/0140-Phantom-flames-on-swoop.patch diff --git a/patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 95% rename from patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch index 861ed55c7..f8827c52b 100644 --- a/patches/server/0140-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for chests to open even with a solid block on top diff --git a/src/main/java/net/minecraft/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java -index d980a556785b52fe827310b83638139df0816b11..3c8c02fc92374def12254f7ffad604b2779117f6 100644 +index eecb8c089b5f426b1395b47f714af32c210555ef..ac82e2b0f4ca1232cc7ec6e4c7dd261308f61aaf 100644 --- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java +++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java @@ -349,6 +349,7 @@ public class ChestBlock extends AbstractChestBlock implements diff --git a/patches/server/0141-Implement-TPSBar.patch b/patches/server/0142-Implement-TPSBar.patch similarity index 97% rename from patches/server/0141-Implement-TPSBar.patch rename to patches/server/0142-Implement-TPSBar.patch index 300f652e8..b1ace3fb9 100644 --- a/patches/server/0141-Implement-TPSBar.patch +++ b/patches/server/0142-Implement-TPSBar.patch @@ -42,18 +42,18 @@ index fc6a6e88486c5c2dca1b10bfeae24124690d7b8d..7b66b301b10158e9c715834b24bdfab1 } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b520d4980180462628ede1383ee1826bbd6a6ad2..21696b7a35cabca1c470304573c01557e21b7262 100644 +index 7684f55d2f9f85c14763dfa4fc4c4dc49711b841..48ecf94e218094ea291776cd54ad81fca325848f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -259,6 +259,7 @@ public class ServerPlayer extends Player { - // CraftBukkit end +@@ -260,6 +260,7 @@ public class ServerPlayer extends Player { public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper + public boolean purpurClient = false; // Purpur public boolean acceptingResourcePack = false; // Purpur + private boolean tpsBar = false; // Purpur public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper -@@ -481,6 +482,7 @@ public class ServerPlayer extends Player { +@@ -482,6 +483,7 @@ public class ServerPlayer extends Player { } } @@ -61,7 +61,7 @@ index b520d4980180462628ede1383ee1826bbd6a6ad2..21696b7a35cabca1c470304573c01557 } @Override -@@ -541,6 +543,7 @@ public class ServerPlayer extends Player { +@@ -542,6 +544,7 @@ public class ServerPlayer extends Player { } this.getBukkitEntity().setExtraData(nbt); // CraftBukkit @@ -69,7 +69,7 @@ index b520d4980180462628ede1383ee1826bbd6a6ad2..21696b7a35cabca1c470304573c01557 } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -2519,5 +2522,13 @@ public class ServerPlayer extends Player { +@@ -2520,5 +2523,13 @@ public class ServerPlayer extends Player { this.server.getPlayerList().moveToWorld(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck); } } diff --git a/patches/server/0142-Striders-give-saddle-back.patch b/patches/server/0143-Striders-give-saddle-back.patch similarity index 100% rename from patches/server/0142-Striders-give-saddle-back.patch rename to patches/server/0143-Striders-give-saddle-back.patch diff --git a/patches/server/0143-PlayerBookTooLargeEvent.patch b/patches/server/0144-PlayerBookTooLargeEvent.patch similarity index 96% rename from patches/server/0143-PlayerBookTooLargeEvent.patch rename to patches/server/0144-PlayerBookTooLargeEvent.patch index 7554bc1dc..9dccc4136 100644 --- a/patches/server/0143-PlayerBookTooLargeEvent.patch +++ b/patches/server/0144-PlayerBookTooLargeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 547572a579c434055956eab627195dbb5e5d4fa8..f07dfd7abebf904c7bdc6751e849fe32d765afc6 100644 +index a4e38e61138b2bfeee30a76e1f0e199d79bedfe9..9b0067709240582bfd69fd4d8c49b5321c447448 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1122,10 +1122,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch similarity index 100% rename from patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch rename to patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch diff --git a/patches/server/0145-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch similarity index 100% rename from patches/server/0145-Fix-rotating-UP-DOWN-CW-and-CCW.patch rename to patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch diff --git a/patches/server/0146-Add-MC-4-fix-back.patch b/patches/server/0147-Add-MC-4-fix-back.patch similarity index 91% rename from patches/server/0146-Add-MC-4-fix-back.patch rename to patches/server/0147-Add-MC-4-fix-back.patch index 29d3526bf..5c54ea054 100644 --- a/patches/server/0146-Add-MC-4-fix-back.patch +++ b/patches/server/0147-Add-MC-4-fix-back.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add MC-4 fix back diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ad691bd5c17ef7a8ecb394d620e02b28ac08f5a4..b106801e08d5a87eaaf115653cf57f58f45f5869 100644 +index bd9293161dd28153d102718720b8f8a3c54536ad..8918fd02f4930eacb4fd842add92bc4e682642ae 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4034,7 +4034,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0147-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch similarity index 100% rename from patches/server/0147-Add-mobGriefing-bypass-to-everything-affected.patch rename to patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch diff --git a/patches/server/0148-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch similarity index 100% rename from patches/server/0148-Config-to-allow-Note-Block-sounds-when-blocked.patch rename to patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch diff --git a/patches/server/0149-Add-EntityTeleportHinderedEvent.patch b/patches/server/0150-Add-EntityTeleportHinderedEvent.patch similarity index 98% rename from patches/server/0149-Add-EntityTeleportHinderedEvent.patch rename to patches/server/0150-Add-EntityTeleportHinderedEvent.patch index 50d145d00..2956100c7 100644 --- a/patches/server/0149-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0150-Add-EntityTeleportHinderedEvent.patch @@ -98,7 +98,7 @@ index e9c7fd87a0f135649e200e782d40f37766ffc34c..97752cc1fa8234469e2ffdaa1b3606d9 noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove); persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 52760eabb45c8d2a3db4056ef219e7ea5cf8d954..53fc3c278624d8c1d2f8bee6df27315d08875300 100644 +index fb5cd6fe7903f3f96af1abb55832bafb7ca7f4a8..4175462de0d6306e4cd0871853ef4f0a06895359 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -561,6 +561,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -113,7 +113,7 @@ index 52760eabb45c8d2a3db4056ef219e7ea5cf8d954..53fc3c278624d8c1d2f8bee6df27315d } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d38d724cd024bec0554b078b0c7fd479a51dd736..5b3bfb4c6fb717f172a62899f8e8ff81ba062c8c 100644 +index 61194cb8aa88f8cf2eb7da1c6ac17d94a5c02355..0d6cf86a55013bee91821926532907515f1a3919 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1003,6 +1003,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0150-Add-StructureGenerateEvent.patch b/patches/server/0151-Add-StructureGenerateEvent.patch similarity index 100% rename from patches/server/0150-Add-StructureGenerateEvent.patch rename to patches/server/0151-Add-StructureGenerateEvent.patch diff --git a/patches/server/0151-Farmland-trampling-changes.patch b/patches/server/0152-Farmland-trampling-changes.patch similarity index 100% rename from patches/server/0151-Farmland-trampling-changes.patch rename to patches/server/0152-Farmland-trampling-changes.patch diff --git a/patches/server/0152-Movement-options-for-armor-stands.patch b/patches/server/0153-Movement-options-for-armor-stands.patch similarity index 98% rename from patches/server/0152-Movement-options-for-armor-stands.patch rename to patches/server/0153-Movement-options-for-armor-stands.patch index 4ea24a0ae..27c1c99c5 100644 --- a/patches/server/0152-Movement-options-for-armor-stands.patch +++ b/patches/server/0153-Movement-options-for-armor-stands.patch @@ -17,7 +17,7 @@ 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/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b106801e08d5a87eaaf115653cf57f58f45f5869..1ffbcac353fcb604ab41e3b4ed4f6555833c25ff 100644 +index 8918fd02f4930eacb4fd842add92bc4e682642ae..a1d4bcbafbc80c653ef622828e67145e72fc2ad0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1588,7 +1588,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0153-Fix-stuck-in-portals.patch b/patches/server/0154-Fix-stuck-in-portals.patch similarity index 93% rename from patches/server/0153-Fix-stuck-in-portals.patch rename to patches/server/0154-Fix-stuck-in-portals.patch index 688d6a7f7..f94a7b700 100644 --- a/patches/server/0153-Fix-stuck-in-portals.patch +++ b/patches/server/0154-Fix-stuck-in-portals.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 21696b7a35cabca1c470304573c01557e21b7262..96f36bf1443bddcdca2f471e8beb56fd9ef37e16 100644 +index 48ecf94e218094ea291776cd54ad81fca325848f..d9d66723333c64ee8b0e08248c95bc624941ceed 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1141,6 +1141,7 @@ public class ServerPlayer extends Player { +@@ -1142,6 +1142,7 @@ public class ServerPlayer extends Player { playerlist.sendPlayerPermissionLevel(this); worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION); this.unsetRemoved(); @@ -17,7 +17,7 @@ index 21696b7a35cabca1c470304573c01557e21b7262..96f36bf1443bddcdca2f471e8beb56fd // CraftBukkit end this.setLevel(worldserver); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1ffbcac353fcb604ab41e3b4ed4f6555833c25ff..7d7d5db8c8206a68ae3c241e2106af4582105f1a 100644 +index a1d4bcbafbc80c653ef622828e67145e72fc2ad0..565af7ade5c3de6a1c7a01755db1b7c6c16f0a3c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2698,12 +2698,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0154-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch similarity index 100% rename from patches/server/0154-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch diff --git a/patches/server/0155-Config-to-always-tame-in-Creative.patch b/patches/server/0156-Config-to-always-tame-in-Creative.patch similarity index 100% rename from patches/server/0155-Config-to-always-tame-in-Creative.patch rename to patches/server/0156-Config-to-always-tame-in-Creative.patch diff --git a/patches/server/0156-End-crystal-explosion-options.patch b/patches/server/0157-End-crystal-explosion-options.patch similarity index 100% rename from patches/server/0156-End-crystal-explosion-options.patch rename to patches/server/0157-End-crystal-explosion-options.patch diff --git a/patches/server/0157-Add-unsafe-Entity-serialization-API.patch b/patches/server/0158-Add-unsafe-Entity-serialization-API.patch similarity index 98% rename from patches/server/0157-Add-unsafe-Entity-serialization-API.patch rename to patches/server/0158-Add-unsafe-Entity-serialization-API.patch index 00c5d208d..ee47d2dba 100644 --- a/patches/server/0157-Add-unsafe-Entity-serialization-API.patch +++ b/patches/server/0158-Add-unsafe-Entity-serialization-API.patch @@ -17,7 +17,7 @@ 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/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 53fc3c278624d8c1d2f8bee6df27315d08875300..d79de006a0e636a23419b5be86911d16447f8891 100644 +index 4175462de0d6306e4cd0871853ef4f0a06895359..2fb5c5ea01d5f1071c8e8a39e7863ed0640d3fc9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1260,5 +1260,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0158-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 100% rename from patches/server/0158-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch diff --git a/patches/server/0159-Dont-run-with-scissors.patch b/patches/server/0160-Dont-run-with-scissors.patch similarity index 95% rename from patches/server/0159-Dont-run-with-scissors.patch rename to patches/server/0160-Dont-run-with-scissors.patch index 1c67e58e7..b77f460fc 100644 --- a/patches/server/0159-Dont-run-with-scissors.patch +++ b/patches/server/0160-Dont-run-with-scissors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors! diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f07dfd7abebf904c7bdc6751e849fe32d765afc6..69834b75a81491dcd3133d95cf81cc3cc91bb782 100644 +index 9b0067709240582bfd69fd4d8c49b5321c447448..9a16f301f00dec3c1ce60ac6b1dbe58d7946ef21 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1555,6 +1555,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -23,7 +23,7 @@ index f07dfd7abebf904c7bdc6751e849fe32d765afc6..69834b75a81491dcd3133d95cf81cc3c this.lastGoodX = this.player.getX(); this.lastGoodY = this.player.getY(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 7ed1d5b2aab3442f80532c62a398353e89c18b0c..45d536954b8007de69c6f74942c2293510739a5e 100644 +index da4d5b05cf2daa31ecd70d2815017bbb6e771313..ccd228aa323eef108526640dfe03b07541041236 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -165,6 +165,7 @@ public class PurpurConfig { diff --git a/patches/server/0160-One-Punch-Man.patch b/patches/server/0161-One-Punch-Man.patch similarity index 100% rename from patches/server/0160-One-Punch-Man.patch rename to patches/server/0161-One-Punch-Man.patch diff --git a/patches/server/0161-Add-config-for-snow-on-blue-ice.patch b/patches/server/0162-Add-config-for-snow-on-blue-ice.patch similarity index 100% rename from patches/server/0161-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0162-Add-config-for-snow-on-blue-ice.patch diff --git a/patches/server/0162-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 100% rename from patches/server/0162-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch diff --git a/patches/server/0163-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 93% rename from patches/server/0163-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch index 3b0abe5e6..1b23f5e8b 100644 --- a/patches/server/0163-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 96f36bf1443bddcdca2f471e8beb56fd9ef37e16..acbc7f61fe3669679f559f2942675c0fde61a8ec 100644 +index d9d66723333c64ee8b0e08248c95bc624941ceed..1bb9e89e332dd7cce479bcb393066518a82b68ad 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1304,7 +1304,7 @@ public class ServerPlayer extends Player { +@@ -1305,7 +1305,7 @@ public class ServerPlayer extends Player { return entitymonster.isPreventingPlayerRest((Player) this); }); diff --git a/patches/server/0164-Add-back-player-spawned-endermite-API.patch b/patches/server/0165-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0164-Add-back-player-spawned-endermite-API.patch rename to patches/server/0165-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0165-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 100% rename from patches/server/0165-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch diff --git a/patches/server/0166-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 100% rename from patches/server/0166-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch diff --git a/patches/server/0167-Tick-fluids-config.patch b/patches/server/0168-Tick-fluids-config.patch similarity index 100% rename from patches/server/0167-Tick-fluids-config.patch rename to patches/server/0168-Tick-fluids-config.patch diff --git a/patches/server/0168-Config-to-disable-Llama-caravans.patch b/patches/server/0169-Config-to-disable-Llama-caravans.patch similarity index 100% rename from patches/server/0168-Config-to-disable-Llama-caravans.patch rename to patches/server/0169-Config-to-disable-Llama-caravans.patch diff --git a/patches/server/0169-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0170-Config-to-make-Creepers-explode-on-death.patch similarity index 100% rename from patches/server/0169-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0170-Config-to-make-Creepers-explode-on-death.patch diff --git a/patches/server/0170-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0171-Configurable-ravager-griefable-blocks-list.patch similarity index 100% rename from patches/server/0170-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0171-Configurable-ravager-griefable-blocks-list.patch diff --git a/patches/server/0171-Sneak-to-bulk-process-composter.patch b/patches/server/0172-Sneak-to-bulk-process-composter.patch similarity index 100% rename from patches/server/0171-Sneak-to-bulk-process-composter.patch rename to patches/server/0172-Sneak-to-bulk-process-composter.patch diff --git a/patches/server/0172-Config-for-skipping-night.patch b/patches/server/0173-Config-for-skipping-night.patch similarity index 96% rename from patches/server/0172-Config-for-skipping-night.patch rename to patches/server/0173-Config-for-skipping-night.patch index f91972237..3cf37443a 100644 --- a/patches/server/0172-Config-for-skipping-night.patch +++ b/patches/server/0173-Config-for-skipping-night.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3bc63f24bf8c07b89562887bdc8cf7569d7b33b4..27d41f7e03404d349a465848235c63b1f5e3200c 100644 +index 239bb3f470fe1b323a7fbad622fcff05cb23cc31..124c9bdba9dc95390831e9c43ddacca0bb356c95 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -717,7 +717,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0173-Add-config-for-villager-trading.patch b/patches/server/0174-Add-config-for-villager-trading.patch similarity index 100% rename from patches/server/0173-Add-config-for-villager-trading.patch rename to patches/server/0174-Add-config-for-villager-trading.patch diff --git a/patches/server/0174-Allow-infinity-on-crossbows.patch b/patches/server/0175-Allow-infinity-on-crossbows.patch similarity index 100% rename from patches/server/0174-Allow-infinity-on-crossbows.patch rename to patches/server/0175-Allow-infinity-on-crossbows.patch diff --git a/patches/server/0175-Drowning-Settings.patch b/patches/server/0176-Drowning-Settings.patch similarity index 97% rename from patches/server/0175-Drowning-Settings.patch rename to patches/server/0176-Drowning-Settings.patch index 800baad84..1d7bbcf4b 100644 --- a/patches/server/0175-Drowning-Settings.patch +++ b/patches/server/0176-Drowning-Settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Drowning Settings diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7d7d5db8c8206a68ae3c241e2106af4582105f1a..9d632b7d45ab8f61601107db6a8f4745ec131289 100644 +index 565af7ade5c3de6a1c7a01755db1b7c6c16f0a3c..f9fd38138fd50b7934f19fb295493a34a4aa89b7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2932,7 +2932,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0176-Break-individual-slabs-when-sneaking.patch b/patches/server/0177-Break-individual-slabs-when-sneaking.patch similarity index 100% rename from patches/server/0176-Break-individual-slabs-when-sneaking.patch rename to patches/server/0177-Break-individual-slabs-when-sneaking.patch diff --git a/patches/server/0177-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 100% rename from patches/server/0177-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch diff --git a/patches/server/0178-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 100% rename from patches/server/0178-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch diff --git a/patches/server/0179-Option-to-make-doors-require-redstone.patch b/patches/server/0180-Option-to-make-doors-require-redstone.patch similarity index 100% rename from patches/server/0179-Option-to-make-doors-require-redstone.patch rename to patches/server/0180-Option-to-make-doors-require-redstone.patch diff --git a/patches/server/0180-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0181-Config-to-allow-for-unsafe-enchants.patch similarity index 100% rename from patches/server/0180-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0181-Config-to-allow-for-unsafe-enchants.patch diff --git a/patches/server/0181-Configurable-sponge-absorption.patch b/patches/server/0182-Configurable-sponge-absorption.patch similarity index 100% rename from patches/server/0181-Configurable-sponge-absorption.patch rename to patches/server/0182-Configurable-sponge-absorption.patch diff --git a/patches/server/0182-Projectile-offset-config.patch b/patches/server/0183-Projectile-offset-config.patch similarity index 100% rename from patches/server/0182-Projectile-offset-config.patch rename to patches/server/0183-Projectile-offset-config.patch diff --git a/patches/server/0183-Config-for-powered-rail-activation-distance.patch b/patches/server/0184-Config-for-powered-rail-activation-distance.patch similarity index 100% rename from patches/server/0183-Config-for-powered-rail-activation-distance.patch rename to patches/server/0184-Config-for-powered-rail-activation-distance.patch diff --git a/patches/server/0184-Piglin-portal-spawn-modifier.patch b/patches/server/0185-Piglin-portal-spawn-modifier.patch similarity index 100% rename from patches/server/0184-Piglin-portal-spawn-modifier.patch rename to patches/server/0185-Piglin-portal-spawn-modifier.patch diff --git a/patches/server/0185-Config-to-change-max-number-of-bees.patch b/patches/server/0186-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0185-Config-to-change-max-number-of-bees.patch rename to patches/server/0186-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch similarity index 97% rename from patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch index 6d66db958..a5e83ab82 100644 --- a/patches/server/0186-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage settings for magma blocks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9d632b7d45ab8f61601107db6a8f4745ec131289..6972880a375c60d19c03e0988e9ab9f80041d451 100644 +index f9fd38138fd50b7934f19fb295493a34a4aa89b7..5572fe00a915fc31afe3bc7dcf45e894d7cb69b5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1001,7 +1001,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0187-Config-for-wither-explosion-radius.patch b/patches/server/0188-Config-for-wither-explosion-radius.patch similarity index 100% rename from patches/server/0187-Config-for-wither-explosion-radius.patch rename to patches/server/0188-Config-for-wither-explosion-radius.patch diff --git a/patches/server/0188-Gamemode-extra-permissions.patch b/patches/server/0189-Gamemode-extra-permissions.patch similarity index 100% rename from patches/server/0188-Gamemode-extra-permissions.patch rename to patches/server/0189-Gamemode-extra-permissions.patch diff --git a/patches/server/0189-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch similarity index 100% rename from patches/server/0189-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch rename to patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch diff --git a/patches/server/0190-Configurable-piston-push-limit.patch b/patches/server/0191-Configurable-piston-push-limit.patch similarity index 100% rename from patches/server/0190-Configurable-piston-push-limit.patch rename to patches/server/0191-Configurable-piston-push-limit.patch diff --git a/patches/server/0191-Configurable-broadcast-settings.patch b/patches/server/0192-Configurable-broadcast-settings.patch similarity index 93% rename from patches/server/0191-Configurable-broadcast-settings.patch rename to patches/server/0192-Configurable-broadcast-settings.patch index 504c02098..afca655bc 100644 --- a/patches/server/0191-Configurable-broadcast-settings.patch +++ b/patches/server/0192-Configurable-broadcast-settings.patch @@ -17,10 +17,10 @@ index c46df052a5a39d92688f51377ee1f7b5b5b36faa..d7d2a975386cecb0d50b4f7ed37de8ad // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index acbc7f61fe3669679f559f2942675c0fde61a8ec..cd26d6c8ba2d5d6b3b56e484e6e642ab646341e1 100644 +index 1bb9e89e332dd7cce479bcb393066518a82b68ad..1156b34fa5d19042621caafa4aaeae8020cd646d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -879,6 +879,7 @@ public class ServerPlayer extends Player { +@@ -880,6 +880,7 @@ public class ServerPlayer extends Player { }); Team scoreboardteambase = this.getTeam(); @@ -29,7 +29,7 @@ index acbc7f61fe3669679f559f2942675c0fde61a8ec..cd26d6c8ba2d5d6b3b56e484e6e642ab if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) { this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c1926d71aafe3e114f75be5738ab9e3035641894..23674fa9b99c79ffe1b2ee88d0e25b5ab8c91fac 100644 +index 36a1e1bd8988b1dbad1aa8edb59c010d1af629d9..5052879dd910180918052d9cc00df63e398479ee 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -178,6 +178,18 @@ public class PurpurConfig { diff --git a/patches/server/0192-Fix-SPIGOT-6278.patch b/patches/server/0193-Fix-SPIGOT-6278.patch similarity index 89% rename from patches/server/0192-Fix-SPIGOT-6278.patch rename to patches/server/0193-Fix-SPIGOT-6278.patch index 8fb1db3e7..be2fad567 100644 --- a/patches/server/0192-Fix-SPIGOT-6278.patch +++ b/patches/server/0193-Fix-SPIGOT-6278.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-6278 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index 04ffda7f06e48365d091c30a149203f118168a4b..9e42dd636c78fdf7e94521b3f72c52a77563f8c9 100644 +index e51d4254170a68900e95e697120d24b2b8b0ade4..cdb797f23b4460a24a090d3983debcc523913943 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -217,7 +217,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento diff --git a/patches/server/0193-Configurable-mob-blindness.patch b/patches/server/0194-Configurable-mob-blindness.patch similarity index 100% rename from patches/server/0193-Configurable-mob-blindness.patch rename to patches/server/0194-Configurable-mob-blindness.patch diff --git a/patches/server/0194-Hide-hidden-players-from-entity-selector.patch b/patches/server/0195-Hide-hidden-players-from-entity-selector.patch similarity index 100% rename from patches/server/0194-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0195-Hide-hidden-players-from-entity-selector.patch diff --git a/patches/server/0195-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 100% rename from patches/server/0195-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch diff --git a/patches/server/0196-Iron-golem-poppy-calms-anger.patch b/patches/server/0197-Iron-golem-poppy-calms-anger.patch similarity index 100% rename from patches/server/0196-Iron-golem-poppy-calms-anger.patch rename to patches/server/0197-Iron-golem-poppy-calms-anger.patch diff --git a/patches/server/0197-Breedable-parrots.patch b/patches/server/0198-Breedable-parrots.patch similarity index 100% rename from patches/server/0197-Breedable-parrots.patch rename to patches/server/0198-Breedable-parrots.patch diff --git a/patches/server/0198-Configurable-powered-rail-boost-modifier.patch b/patches/server/0199-Configurable-powered-rail-boost-modifier.patch similarity index 100% rename from patches/server/0198-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0199-Configurable-powered-rail-boost-modifier.patch diff --git a/patches/server/0199-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch similarity index 100% rename from patches/server/0199-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch diff --git a/patches/server/0200-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch similarity index 100% rename from patches/server/0200-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch diff --git a/patches/server/0201-Config-for-unverified-username-message.patch b/patches/server/0202-Config-for-unverified-username-message.patch similarity index 97% rename from patches/server/0201-Config-for-unverified-username-message.patch rename to patches/server/0202-Config-for-unverified-username-message.patch index daf9e68e8..1050d3599 100644 --- a/patches/server/0201-Config-for-unverified-username-message.patch +++ b/patches/server/0202-Config-for-unverified-username-message.patch @@ -18,7 +18,7 @@ index 45e77d96f673ce68cf15ce3d45fd1eeffed4d8d8..811b48e0b91e2af30a122b72803591e4 } } catch (AuthenticationUnavailableException authenticationunavailableexception) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 45626d15e91ac2c0fa745f2670d3877a7387e0d2..aa9bed62b71894b74f86ee1016d192293a702fd1 100644 +index 0496d20d982815cc1c56051331ffb51e3d9d0038..b1cb0e5857509921c2f2c112e98ec2801ce5c4c2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -166,6 +166,7 @@ public class PurpurConfig { diff --git a/patches/server/0202-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0203-Make-anvil-cumulative-cost-configurable.patch similarity index 100% rename from patches/server/0202-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0203-Make-anvil-cumulative-cost-configurable.patch diff --git a/patches/server/0203-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0204-ShulkerBox-allow-oversized-stacks.patch similarity index 100% rename from patches/server/0203-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0204-ShulkerBox-allow-oversized-stacks.patch diff --git a/patches/server/0204-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0205-Bee-can-work-when-raining-or-at-night.patch similarity index 100% rename from patches/server/0204-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0205-Bee-can-work-when-raining-or-at-night.patch diff --git a/patches/server/0205-API-for-any-mob-to-burn-daylight.patch b/patches/server/0206-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/server/0205-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0206-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/server/0206-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0207-Fix-advancement-triggers-on-entity-death.patch similarity index 100% rename from patches/server/0206-Fix-advancement-triggers-on-entity-death.patch rename to patches/server/0207-Fix-advancement-triggers-on-entity-death.patch diff --git a/patches/server/0207-Config-MobEffect-by-world.patch b/patches/server/0208-Config-MobEffect-by-world.patch similarity index 100% rename from patches/server/0207-Config-MobEffect-by-world.patch rename to patches/server/0208-Config-MobEffect-by-world.patch diff --git a/patches/server/0208-Beacon-Activation-Range-Configurable.patch b/patches/server/0209-Beacon-Activation-Range-Configurable.patch similarity index 100% rename from patches/server/0208-Beacon-Activation-Range-Configurable.patch rename to patches/server/0209-Beacon-Activation-Range-Configurable.patch diff --git a/patches/server/0209-Add-toggle-for-sand-duping-fix.patch b/patches/server/0210-Add-toggle-for-sand-duping-fix.patch similarity index 100% rename from patches/server/0209-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0210-Add-toggle-for-sand-duping-fix.patch diff --git a/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 97% rename from patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch index 1451f2c6f..22d901031 100644 --- a/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for end portal safe teleporting diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 010a47813b2b3dbc0739c203e4186d14cc780579..d209a7b09d8429573c93af3d6159f30e6bc877ec 100644 +index c0f97b07f7c0c98699f90f6c2cc6bd67c1fe59ee..8d7fe80d3a8bf49b5dda3b9f46754dc2559ade2f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2749,7 +2749,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0211-Flying-Fall-Damage-API.patch b/patches/server/0212-Flying-Fall-Damage-API.patch similarity index 95% rename from patches/server/0211-Flying-Fall-Damage-API.patch rename to patches/server/0212-Flying-Fall-Damage-API.patch index e7b590234..e3c63cff2 100644 --- a/patches/server/0211-Flying-Fall-Damage-API.patch +++ b/patches/server/0212-Flying-Fall-Damage-API.patch @@ -26,7 +26,7 @@ index b60e38add38ac58d01f419dcb1b07a9b79bf1cb8..e2b2ee49f9b8220c2de3f26389e78b63 } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5b3bfb4c6fb717f172a62899f8e8ff81ba062c8c..6b5ea129db39a9460dfc2ce02711f9014c45497d 100644 +index 0d6cf86a55013bee91821926532907515f1a3919..8909e850d787b3bc1adbed9b614a2b8678d47f55 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2590,5 +2590,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0212-Make-lightning-rod-range-configurable.patch b/patches/server/0213-Make-lightning-rod-range-configurable.patch similarity index 100% rename from patches/server/0212-Make-lightning-rod-range-configurable.patch rename to patches/server/0213-Make-lightning-rod-range-configurable.patch diff --git a/patches/server/0213-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch similarity index 100% rename from patches/server/0213-Burp-after-eating-food-fills-hunger-bar-completely.patch rename to patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch diff --git a/patches/server/0214-Allow-player-join-full-server-by-permission.patch b/patches/server/0215-Allow-player-join-full-server-by-permission.patch similarity index 93% rename from patches/server/0214-Allow-player-join-full-server-by-permission.patch rename to patches/server/0215-Allow-player-join-full-server-by-permission.patch index bcc45e07c..53075c903 100644 --- a/patches/server/0214-Allow-player-join-full-server-by-permission.patch +++ b/patches/server/0215-Allow-player-join-full-server-by-permission.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 54db0206bbeea62525ada78b0f9cd99b4f9fddff..5c9cb6fa72fef151b6c9038e2536a4fdf330375e 100644 +index 9a0065bd8eeb758daeb49d82ba8f2c09a6e4f533..94df8ba1b38fb5df039d5ddcb0374d0147d9b3ed 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -765,7 +765,7 @@ public abstract class PlayerList { diff --git a/patches/server/0215-Populator-seed-controls.patch b/patches/server/0216-Populator-seed-controls.patch similarity index 100% rename from patches/server/0215-Populator-seed-controls.patch rename to patches/server/0216-Populator-seed-controls.patch diff --git a/patches/server/0216-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0217-Add-permission-bypass-for-portal-waiting.patch similarity index 94% rename from patches/server/0216-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0217-Add-permission-bypass-for-portal-waiting.patch index 60cb7e6ac..0697b84bf 100644 --- a/patches/server/0216-Add-permission-bypass-for-portal-waiting.patch +++ b/patches/server/0217-Add-permission-bypass-for-portal-waiting.patch @@ -26,7 +26,7 @@ index 79782538277b60a1c1c16c1c75b53b7d8a2c00ee..2064f93074a58c116352ee768ef9ad96 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 9ae925e02698fdfd2f77ab40268b9ac0635f9bd2..435f33938f9bd6d0fe62d3333d1995e7b05a162e 100644 +index 7c7d05852dd463331110d1dcb71b4d4f5312900f..5939aeff08fd1216c53f3af15362dddfa1e207c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -245,6 +245,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0217-Shulker-spawn-from-bullet-options.patch b/patches/server/0218-Shulker-spawn-from-bullet-options.patch similarity index 100% rename from patches/server/0217-Shulker-spawn-from-bullet-options.patch rename to patches/server/0218-Shulker-spawn-from-bullet-options.patch diff --git a/patches/server/0218-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0219-Eating-glow-berries-adds-glow-effect.patch similarity index 100% rename from patches/server/0218-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0219-Eating-glow-berries-adds-glow-effect.patch diff --git a/patches/server/0219-Option-to-make-drowned-break-doors.patch b/patches/server/0220-Option-to-make-drowned-break-doors.patch similarity index 100% rename from patches/server/0219-Option-to-make-drowned-break-doors.patch rename to patches/server/0220-Option-to-make-drowned-break-doors.patch diff --git a/patches/server/0220-Configurable-hunger-starvation-damage.patch b/patches/server/0221-Configurable-hunger-starvation-damage.patch similarity index 100% rename from patches/server/0220-Configurable-hunger-starvation-damage.patch rename to patches/server/0221-Configurable-hunger-starvation-damage.patch diff --git a/patches/server/0221-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch similarity index 100% rename from patches/server/0221-Redirect-System.out-calls-to-plugin-loggers.patch rename to patches/server/0222-Redirect-System.out-calls-to-plugin-loggers.patch diff --git a/patches/server/0222-Armor-click-equip-options.patch b/patches/server/0223-Armor-click-equip-options.patch similarity index 100% rename from patches/server/0222-Armor-click-equip-options.patch rename to patches/server/0223-Armor-click-equip-options.patch diff --git a/patches/server/0223-Add-uptime-command.patch b/patches/server/0224-Add-uptime-command.patch similarity index 100% rename from patches/server/0223-Add-uptime-command.patch rename to patches/server/0224-Add-uptime-command.patch diff --git a/patches/server/0224-Structure-seed-options.patch b/patches/server/0225-Structure-seed-options.patch similarity index 97% rename from patches/server/0224-Structure-seed-options.patch rename to patches/server/0225-Structure-seed-options.patch index 2f0645e57..0aa483039 100644 --- a/patches/server/0224-Structure-seed-options.patch +++ b/patches/server/0225-Structure-seed-options.patch @@ -27,7 +27,7 @@ index f71cc1f5e5d594e82a4e6132d438bae74b9370a7..77948e19dd99b6f30bf294c9d5308228 updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed)); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 07e5bb1b148376b3962a983b3d192bd838e04e02..808d763e767fd4f727c5f0a735c3e5d4ac17a47e 100644 +index 2def6767b2ee97d9c662b93796ed97bcfd3bbebc..97dba790a02fe54da4278c7e913dbbcf8a25d126 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -247,6 +247,9 @@ public class PurpurConfig { diff --git a/patches/server/0225-Tool-actionable-options.patch b/patches/server/0226-Tool-actionable-options.patch similarity index 100% rename from patches/server/0225-Tool-actionable-options.patch rename to patches/server/0226-Tool-actionable-options.patch diff --git a/patches/server/0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch b/patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch similarity index 100% rename from patches/server/0226-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch rename to patches/server/0227-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch diff --git a/patches/server/0227-Store-placer-on-Block-when-placed.patch b/patches/server/0228-Store-placer-on-Block-when-placed.patch similarity index 100% rename from patches/server/0227-Store-placer-on-Block-when-placed.patch rename to patches/server/0228-Store-placer-on-Block-when-placed.patch diff --git a/patches/server/0228-Summoner-API.patch b/patches/server/0229-Summoner-API.patch similarity index 99% rename from patches/server/0228-Summoner-API.patch rename to patches/server/0229-Summoner-API.patch index 3c9646695..080c26deb 100644 --- a/patches/server/0228-Summoner-API.patch +++ b/patches/server/0229-Summoner-API.patch @@ -49,7 +49,7 @@ index cea3725009af1bc746a593c4db63ed630889cd21..70d5b30a23b41579d4edf7542480c404 } diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java -index c66e72606c346d12d628b92dda97a997e503bdaf..5200f5188144cb50d46be72e4ff476496e7684d3 100644 +index 37d2de60ea0fdb3fe4dcfd72f154b33bae675b74..bd89c62101be03bc3d13a1400efceaa26b901fa1 100644 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java @@ -48,6 +48,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM diff --git a/patches/server/0229-Customizable-sleeping-actionbar-messages.patch b/patches/server/0230-Customizable-sleeping-actionbar-messages.patch similarity index 95% rename from patches/server/0229-Customizable-sleeping-actionbar-messages.patch rename to patches/server/0230-Customizable-sleeping-actionbar-messages.patch index 93f7ebef2..b9fe6560a 100644 --- a/patches/server/0229-Customizable-sleeping-actionbar-messages.patch +++ b/patches/server/0230-Customizable-sleeping-actionbar-messages.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Customizable sleeping actionbar messages diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index da0095bf9f2237dc4846f655e4698b0976224771..287e0b565566d36aea0a023ccccd2f12fd4643cd 100644 +index 298e37f35167434a3ee403e28808fbebb5a7809c..fed85a378cb1cd80ff8ed66017340f8106d9cb34 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1045,11 +1045,29 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -40,7 +40,7 @@ index da0095bf9f2237dc4846f655e4698b0976224771..287e0b565566d36aea0a023ccccd2f12 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 0fada677e0aa6ffa4b654d7eae307863d8fc6e59..8244f362f551ed2bdef4df8e6b83cb176b4a4e59 100644 +index 60412d24201bbd61162662b3a2270eecab39fa3d..adfec9c94849b5371e9188eb0ce18565c2d17fc9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -168,6 +168,8 @@ public class PurpurConfig { diff --git a/patches/server/0230-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch similarity index 100% rename from patches/server/0230-option-to-disable-shulker-box-items-from-dropping-co.patch rename to patches/server/0231-option-to-disable-shulker-box-items-from-dropping-co.patch diff --git a/patches/server/0231-Silk-touchable-budding-amethyst.patch b/patches/server/0232-Silk-touchable-budding-amethyst.patch similarity index 100% rename from patches/server/0231-Silk-touchable-budding-amethyst.patch rename to patches/server/0232-Silk-touchable-budding-amethyst.patch diff --git a/patches/server/0232-Big-dripleaf-tilt-delay.patch b/patches/server/0233-Big-dripleaf-tilt-delay.patch similarity index 100% rename from patches/server/0232-Big-dripleaf-tilt-delay.patch rename to patches/server/0233-Big-dripleaf-tilt-delay.patch diff --git a/patches/server/0233-Player-ridable-in-water-option.patch b/patches/server/0234-Player-ridable-in-water-option.patch similarity index 100% rename from patches/server/0233-Player-ridable-in-water-option.patch rename to patches/server/0234-Player-ridable-in-water-option.patch diff --git a/patches/server/0234-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0235-Config-to-disable-Enderman-teleport-on-projectile-hi.patch similarity index 100% rename from patches/server/0234-Config-to-disable-Enderman-teleport-on-projectile-hi.patch rename to patches/server/0235-Config-to-disable-Enderman-teleport-on-projectile-hi.patch diff --git a/patches/server/0235-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch b/patches/server/0236-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch similarity index 100% rename from patches/server/0235-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch rename to patches/server/0236-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch diff --git a/patches/server/0236-Add-compass-command.patch b/patches/server/0237-Add-compass-command.patch similarity index 96% rename from patches/server/0236-Add-compass-command.patch rename to patches/server/0237-Add-compass-command.patch index 6899f8630..66e42d6f9 100644 --- a/patches/server/0236-Add-compass-command.patch +++ b/patches/server/0237-Add-compass-command.patch @@ -17,18 +17,18 @@ index 528fd87ae1c1c01e13885d88fc8056b0f932fb61..bfad241892b8280d261ab8301245b91b if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index cd26d6c8ba2d5d6b3b56e484e6e642ab646341e1..11786d686ed1734f8f41f6127b3499cb094ab528 100644 +index 1156b34fa5d19042621caafa4aaeae8020cd646d..ad03eb867af1dbaf50d9c65461f0477d8911d883 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -260,6 +260,7 @@ public class ServerPlayer extends Player { - public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper +@@ -261,6 +261,7 @@ public class ServerPlayer extends Player { + public boolean purpurClient = false; // Purpur public boolean acceptingResourcePack = false; // Purpur private boolean tpsBar = false; // Purpur + private boolean compassBar = false; // Purpur public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper -@@ -483,6 +484,7 @@ public class ServerPlayer extends Player { +@@ -484,6 +485,7 @@ public class ServerPlayer extends Player { } if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur @@ -36,7 +36,7 @@ index cd26d6c8ba2d5d6b3b56e484e6e642ab646341e1..11786d686ed1734f8f41f6127b3499cb } @Override -@@ -544,6 +546,7 @@ public class ServerPlayer extends Player { +@@ -545,6 +547,7 @@ public class ServerPlayer extends Player { this.getBukkitEntity().setExtraData(nbt); // CraftBukkit nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur @@ -44,7 +44,7 @@ index cd26d6c8ba2d5d6b3b56e484e6e642ab646341e1..11786d686ed1734f8f41f6127b3499cb } // CraftBukkit start - World fallback code, either respawn location or global spawn -@@ -2532,5 +2535,13 @@ public class ServerPlayer extends Player { +@@ -2533,5 +2536,13 @@ public class ServerPlayer extends Player { public void tpsBar(boolean tpsBar) { this.tpsBar = tpsBar; } diff --git a/patches/server/0237-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0238-Config-to-prevent-horses-from-standing-with-riders.patch similarity index 100% rename from patches/server/0237-Config-to-prevent-horses-from-standing-with-riders.patch rename to patches/server/0238-Config-to-prevent-horses-from-standing-with-riders.patch diff --git a/patches/server/0238-Fix-533-crash-exploit.patch b/patches/server/0239-Fix-533-crash-exploit.patch similarity index 100% rename from patches/server/0238-Fix-533-crash-exploit.patch rename to patches/server/0239-Fix-533-crash-exploit.patch