diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0013-Lagging-threshold.patch similarity index 100% rename from patches/api/0014-Lagging-threshold.patch rename to patches/api/0013-Lagging-threshold.patch diff --git a/patches/api/0013-MoonPhase-API.patch b/patches/api/0013-MoonPhase-API.patch deleted file mode 100644 index e74c088bf..000000000 --- a/patches/api/0013-MoonPhase-API.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sat, 1 Feb 2020 22:22:07 -0600 -Subject: [PATCH] MoonPhase API - - -diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java -new file mode 100644 -index 000000000..f5ad98c62 ---- /dev/null -+++ b/src/main/java/net/pl3x/purpur/MoonPhase.java -@@ -0,0 +1,36 @@ -+package net.pl3x.purpur; -+ -+import org.jetbrains.annotations.NotNull; -+ -+import java.util.HashMap; -+import java.util.Map; -+ -+public enum MoonPhase { -+ FULL_MOON(0L), -+ WANING_GIBBOUS(1L), -+ LAST_QUARTER(2L), -+ WANING_CRESCENT(3L), -+ NEW_MOON(4L), -+ WAXING_CRESCENT(5L), -+ FIRST_QUARTER(6L), -+ WAXING_GIBBOUS(7L); -+ -+ private final long day; -+ -+ MoonPhase(long day) { -+ this.day = day; -+ } -+ -+ private static final Map BY_DAY = new HashMap<>(); -+ -+ static { -+ for (MoonPhase phase : values()) { -+ BY_DAY.put(phase.day, phase); -+ } -+ } -+ -+ @NotNull -+ public static MoonPhase getPhase(long day) { -+ return BY_DAY.get(day % 8L); -+ } -+} -diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index e827e1a6f..2685dfa18 100644 ---- a/src/main/java/org/bukkit/World.java -+++ b/src/main/java/org/bukkit/World.java -@@ -3466,6 +3466,16 @@ public interface World extends PluginMessageRecipient, Metadatable { - @NotNull - public List getRaids(); - -+ // Purpur start -+ /** -+ * Get the moon phase of the world at the current time -+ * -+ * @return Current moon phase -+ */ -+ @NotNull -+ net.pl3x.purpur.MoonPhase getMoonPhase(); -+ // Purpur end -+ - /** - * Get the {@link DragonBattle} associated with this world. - * diff --git a/patches/api/0015-ItemFactory-getMonsterEgg.patch b/patches/api/0014-ItemFactory-getMonsterEgg.patch similarity index 96% rename from patches/api/0015-ItemFactory-getMonsterEgg.patch rename to patches/api/0014-ItemFactory-getMonsterEgg.patch index 56b8a6a38..c0600d00a 100644 --- a/patches/api/0015-ItemFactory-getMonsterEgg.patch +++ b/patches/api/0014-ItemFactory-getMonsterEgg.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemFactory#getMonsterEgg diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 03ba2265..630c15d2 100644 +index 03ba22659..630c15d23 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -166,4 +166,15 @@ public interface ItemFactory { diff --git a/patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 98% rename from patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch index 2c595bf1d..5c8ca4a66 100644 --- a/patches/api/0016-PlayerSetSpawnerTypeWithEggEvent.patch +++ b/patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent diff --git a/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java new file mode 100644 -index 00000000..c050b75e +index 000000000..c050b75e9 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java @@ -0,0 +1,85 @@ diff --git a/patches/api/0017-EMC-MonsterEggSpawnEvent.patch b/patches/api/0016-EMC-MonsterEggSpawnEvent.patch similarity index 98% rename from patches/api/0017-EMC-MonsterEggSpawnEvent.patch rename to patches/api/0016-EMC-MonsterEggSpawnEvent.patch index 7436a90e5..d58cd5e2d 100644 --- a/patches/api/0017-EMC-MonsterEggSpawnEvent.patch +++ b/patches/api/0016-EMC-MonsterEggSpawnEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent diff --git a/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java new file mode 100644 -index 00000000..983d6723 +index 000000000..983d67234 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java @@ -0,0 +1,67 @@ diff --git a/patches/api/0018-Villager-resetOffers.patch b/patches/api/0017-Villager-resetOffers.patch similarity index 95% rename from patches/api/0018-Villager-resetOffers.patch rename to patches/api/0017-Villager-resetOffers.patch index d20d5d8fd..0606f629f 100644 --- a/patches/api/0018-Villager-resetOffers.patch +++ b/patches/api/0017-Villager-resetOffers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Villager#resetOffers diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java -index c8777a47..ed703af4 100644 +index c8777a476..ed703af45 100644 --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java @@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager { diff --git a/patches/api/0019-LivingEntity-playPickupItemAnimation.patch b/patches/api/0018-LivingEntity-playPickupItemAnimation.patch similarity index 97% rename from patches/api/0019-LivingEntity-playPickupItemAnimation.patch rename to patches/api/0018-LivingEntity-playPickupItemAnimation.patch index a6de5e83a..d356b5d29 100644 --- a/patches/api/0019-LivingEntity-playPickupItemAnimation.patch +++ b/patches/api/0018-LivingEntity-playPickupItemAnimation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#playPickupItemAnimation diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5b688cd0..a0db7694 100644 +index 5b688cd04..a0db76946 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -768,5 +768,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0020-SkeletonHorseTrapEvent-getPlayer.patch b/patches/api/0019-SkeletonHorseTrapEvent-getPlayer.patch similarity index 98% rename from patches/api/0020-SkeletonHorseTrapEvent-getPlayer.patch rename to patches/api/0019-SkeletonHorseTrapEvent-getPlayer.patch index bdc52fc33..ddf4914b8 100644 --- a/patches/api/0020-SkeletonHorseTrapEvent-getPlayer.patch +++ b/patches/api/0019-SkeletonHorseTrapEvent-getPlayer.patch @@ -5,7 +5,7 @@ Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java -index d79dbcd6..1ed3ea8f 100644 +index d79dbcd68..1ed3ea8fa 100644 --- a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java @@ -1,20 +1,30 @@ diff --git a/patches/api/0021-PaperPR-PlayerItemCooldownEvent.patch b/patches/api/0020-PaperPR-PlayerItemCooldownEvent.patch similarity index 98% rename from patches/api/0021-PaperPR-PlayerItemCooldownEvent.patch rename to patches/api/0020-PaperPR-PlayerItemCooldownEvent.patch index 8a4cd16a9..e7d5dc4ae 100644 --- a/patches/api/0021-PaperPR-PlayerItemCooldownEvent.patch +++ b/patches/api/0020-PaperPR-PlayerItemCooldownEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] PaperPR - PlayerItemCooldownEvent diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java new file mode 100644 -index 00000000..2002909f +index 000000000..2002909f3 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java @@ -0,0 +1,77 @@ diff --git a/patches/api/0022-EntityMoveEvent.patch b/patches/api/0021-EntityMoveEvent.patch similarity index 99% rename from patches/api/0022-EntityMoveEvent.patch rename to patches/api/0021-EntityMoveEvent.patch index 7fe49f006..443ae36dd 100644 --- a/patches/api/0022-EntityMoveEvent.patch +++ b/patches/api/0021-EntityMoveEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] EntityMoveEvent diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java new file mode 100644 -index 00000000..c48c525b +index 000000000..c48c525b8 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java @@ -0,0 +1,95 @@ diff --git a/patches/api/0023-PaperPR-BellRingEvent.patch b/patches/api/0022-PaperPR-BellRingEvent.patch similarity index 98% rename from patches/api/0023-PaperPR-BellRingEvent.patch rename to patches/api/0022-PaperPR-BellRingEvent.patch index 057701ee3..a55f14a5e 100644 --- a/patches/api/0023-PaperPR-BellRingEvent.patch +++ b/patches/api/0022-PaperPR-BellRingEvent.patch @@ -8,7 +8,7 @@ village bell. Passes along the bell block and the player who rang it. diff --git a/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java new file mode 100644 -index 00000000..82e0a747 +index 000000000..82e0a747b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BellRingEvent.java @@ -0,0 +1,53 @@ diff --git a/patches/api/0024-Player-invulnerabilities.patch b/patches/api/0023-Player-invulnerabilities.patch similarity index 97% rename from patches/api/0024-Player-invulnerabilities.patch rename to patches/api/0023-Player-invulnerabilities.patch index 903e57512..b60bddf0f 100644 --- a/patches/api/0024-Player-invulnerabilities.patch +++ b/patches/api/0023-Player-invulnerabilities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9dbfe361..1dfe5540 100644 +index 9dbfe3614..1dfe55402 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1897,5 +1897,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0025-Anvil-API.patch b/patches/api/0024-Anvil-API.patch similarity index 97% rename from patches/api/0025-Anvil-API.patch rename to patches/api/0024-Anvil-API.patch index 6c4fc3848..c81549703 100644 --- a/patches/api/0025-Anvil-API.patch +++ b/patches/api/0024-Anvil-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Anvil API diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java new file mode 100644 -index 00000000..85663c0a +index 000000000..85663c0a4 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java @@ -0,0 +1,52 @@ @@ -64,7 +64,7 @@ index 00000000..85663c0a +} diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java new file mode 100644 -index 00000000..2717ad82 +index 000000000..2717ad82c --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java @@ -0,0 +1,35 @@ @@ -104,7 +104,7 @@ index 00000000..2717ad82 + } +} diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java -index b95e563b..435026e5 100644 +index b95e563b5..435026e53 100644 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java @@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory { diff --git a/patches/api/0026-ItemStack-convenience-methods.patch b/patches/api/0025-ItemStack-convenience-methods.patch similarity index 100% rename from patches/api/0026-ItemStack-convenience-methods.patch rename to patches/api/0025-ItemStack-convenience-methods.patch diff --git a/patches/api/0027-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0026-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 97% rename from patches/api/0027-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/api/0026-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 3cda520f2..5676840d5 100644 --- a/patches/api/0027-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/api/0026-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index b4209175..83c51bb5 100644 +index b42091752..83c51bb5e 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -206,4 +206,8 @@ public interface VanillaGoal extends Goal { diff --git a/patches/api/0028-ChatColor-conveniences.patch b/patches/api/0027-ChatColor-conveniences.patch similarity index 97% rename from patches/api/0028-ChatColor-conveniences.patch rename to patches/api/0027-ChatColor-conveniences.patch index 0e9f8582a..858bf3bd1 100644 --- a/patches/api/0028-ChatColor-conveniences.patch +++ b/patches/api/0027-ChatColor-conveniences.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ChatColor conveniences diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java -index 4594701d..499b222d 100644 +index 4594701d7..499b222de 100644 --- a/src/main/java/org/bukkit/ChatColor.java +++ b/src/main/java/org/bukkit/ChatColor.java @@ -413,4 +413,30 @@ public enum ChatColor { diff --git a/patches/api/0029-DragonEggPlaceEvent.patch b/patches/api/0028-DragonEggPlaceEvent.patch similarity index 98% rename from patches/api/0029-DragonEggPlaceEvent.patch rename to patches/api/0028-DragonEggPlaceEvent.patch index 9e1047b61..e8c31304d 100644 --- a/patches/api/0029-DragonEggPlaceEvent.patch +++ b/patches/api/0028-DragonEggPlaceEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] DragonEggPlaceEvent diff --git a/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java new file mode 100644 -index 00000000..bdabfd2b +index 000000000..bdabfd2b5 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/block/DragonEggPlaceEvent.java @@ -0,0 +1,47 @@ diff --git a/patches/api/0030-Ridables.patch b/patches/api/0029-Ridables.patch similarity index 97% rename from patches/api/0030-Ridables.patch rename to patches/api/0029-Ridables.patch index e6a050996..608b9629b 100644 --- a/patches/api/0030-Ridables.patch +++ b/patches/api/0029-Ridables.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ridables diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java new file mode 100644 -index 00000000..c0ec5a13 +index 000000000..c0ec5a130 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java @@ -0,0 +1,37 @@ @@ -48,7 +48,7 @@ index 00000000..c0ec5a13 + } +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 7808ade9..5abf3eaf 100644 +index 7808ade92..5abf3eaf3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -695,4 +695,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0031-Configurable-permission-message-upgrades.patch b/patches/api/0030-Configurable-permission-message-upgrades.patch similarity index 100% rename from patches/api/0031-Configurable-permission-message-upgrades.patch rename to patches/api/0030-Configurable-permission-message-upgrades.patch diff --git a/patches/api/0032-LivingEntity-broadcastItemBreak.patch b/patches/api/0031-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/api/0032-LivingEntity-broadcastItemBreak.patch rename to patches/api/0031-LivingEntity-broadcastItemBreak.patch diff --git a/patches/api/0033-Item-entity-immunities.patch b/patches/api/0032-Item-entity-immunities.patch similarity index 100% rename from patches/api/0033-Item-entity-immunities.patch rename to patches/api/0032-Item-entity-immunities.patch diff --git a/patches/server/0015-Lagging-threshold.patch b/patches/server/0014-Lagging-threshold.patch similarity index 100% rename from patches/server/0015-Lagging-threshold.patch rename to patches/server/0014-Lagging-threshold.patch diff --git a/patches/server/0014-MoonPhase-API.patch b/patches/server/0014-MoonPhase-API.patch deleted file mode 100644 index abf6ce4f5..000000000 --- a/patches/server/0014-MoonPhase-API.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sat, 1 Feb 2020 22:22:16 -0600 -Subject: [PATCH] MoonPhase API - - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4de6252f0..4c092afc4 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2611,4 +2611,11 @@ public class CraftWorld implements World { - return spigot; - } - // Spigot end -+ -+ // Purpur start -+ @Override -+ public net.pl3x.purpur.MoonPhase getMoonPhase() { -+ return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L); -+ } -+ // Purpur end - } diff --git a/patches/server/0016-ItemFactory-getMonsterEgg.patch b/patches/server/0015-ItemFactory-getMonsterEgg.patch similarity index 100% rename from patches/server/0016-ItemFactory-getMonsterEgg.patch rename to patches/server/0015-ItemFactory-getMonsterEgg.patch diff --git a/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 100% rename from patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch diff --git a/patches/server/0018-EMC-MonsterEggSpawnEvent.patch b/patches/server/0017-EMC-MonsterEggSpawnEvent.patch similarity index 100% rename from patches/server/0018-EMC-MonsterEggSpawnEvent.patch rename to patches/server/0017-EMC-MonsterEggSpawnEvent.patch diff --git a/patches/server/0019-Villager-resetOffers.patch b/patches/server/0018-Villager-resetOffers.patch similarity index 100% rename from patches/server/0019-Villager-resetOffers.patch rename to patches/server/0018-Villager-resetOffers.patch diff --git a/patches/server/0020-LivingEntity-playPickupItemAnimation.patch b/patches/server/0019-LivingEntity-playPickupItemAnimation.patch similarity index 100% rename from patches/server/0020-LivingEntity-playPickupItemAnimation.patch rename to patches/server/0019-LivingEntity-playPickupItemAnimation.patch diff --git a/patches/server/0021-SkeletonHorseTrapEvent-getPlayer.patch b/patches/server/0020-SkeletonHorseTrapEvent-getPlayer.patch similarity index 100% rename from patches/server/0021-SkeletonHorseTrapEvent-getPlayer.patch rename to patches/server/0020-SkeletonHorseTrapEvent-getPlayer.patch diff --git a/patches/server/0022-PaperPR-PlayerItemCooldownEvent.patch b/patches/server/0021-PaperPR-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0022-PaperPR-PlayerItemCooldownEvent.patch rename to patches/server/0021-PaperPR-PlayerItemCooldownEvent.patch diff --git a/patches/server/0023-EntityMoveEvent.patch b/patches/server/0022-EntityMoveEvent.patch similarity index 100% rename from patches/server/0023-EntityMoveEvent.patch rename to patches/server/0022-EntityMoveEvent.patch diff --git a/patches/server/0024-PaperPR-Add-BellRingEvent.patch b/patches/server/0023-PaperPR-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0024-PaperPR-Add-BellRingEvent.patch rename to patches/server/0023-PaperPR-Add-BellRingEvent.patch diff --git a/patches/server/0025-Player-invulnerabilities.patch b/patches/server/0024-Player-invulnerabilities.patch similarity index 97% rename from patches/server/0025-Player-invulnerabilities.patch rename to patches/server/0024-Player-invulnerabilities.patch index 019b827c9..fa8ce6766 100644 --- a/patches/server/0025-Player-invulnerabilities.patch +++ b/patches/server/0024-Player-invulnerabilities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8638d46229..71d2a658d8 100644 +index 8638d4622..71d2a658d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -144,6 +144,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -67,7 +67,7 @@ index 8638d46229..71d2a658d8 100644 public Scoreboard getScoreboard() { return getBukkitEntity().getScoreboard().getHandle(); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6c1438f7da..8fa91b8f59 100644 +index 6c1438f7d..8fa91b8f5 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1572,6 +1572,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -79,7 +79,7 @@ index 6c1438f7da..8fa91b8f59 100644 this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus)); // Paper end diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index f9eb17cb6e..75b0565df0 100644 +index 33915eeb0..83219d657 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -903,6 +903,8 @@ public abstract class PlayerList { @@ -92,7 +92,7 @@ index f9eb17cb6e..75b0565df0 100644 return entityplayer1; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2578a4677d..c441fcea9b 100644 +index 2578a4677..c441fcea9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -67,4 +67,11 @@ public class PurpurWorldConfig { @@ -108,7 +108,7 @@ index 2578a4677d..c441fcea9b 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6438cca019..b7f05ac069 100644 +index 6438cca01..b7f05ac06 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2164,5 +2164,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0026-Anvil-API.patch b/patches/server/0025-Anvil-API.patch similarity index 100% rename from patches/server/0026-Anvil-API.patch rename to patches/server/0025-Anvil-API.patch diff --git a/patches/server/0027-Configurable-villager-brain-ticks.patch b/patches/server/0026-Configurable-villager-brain-ticks.patch similarity index 100% rename from patches/server/0027-Configurable-villager-brain-ticks.patch rename to patches/server/0026-Configurable-villager-brain-ticks.patch diff --git a/patches/server/0028-Alternative-Keepalive-Handling.patch b/patches/server/0027-Alternative-Keepalive-Handling.patch similarity index 100% rename from patches/server/0028-Alternative-Keepalive-Handling.patch rename to patches/server/0027-Alternative-Keepalive-Handling.patch diff --git a/patches/server/0029-Silk-touch-spawners.patch b/patches/server/0028-Silk-touch-spawners.patch similarity index 100% rename from patches/server/0029-Silk-touch-spawners.patch rename to patches/server/0028-Silk-touch-spawners.patch diff --git a/patches/server/0030-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0029-MC-168772-Fix-Add-turtle-egg-block-options.patch similarity index 100% rename from patches/server/0030-MC-168772-Fix-Add-turtle-egg-block-options.patch rename to patches/server/0029-MC-168772-Fix-Add-turtle-egg-block-options.patch diff --git a/patches/server/0031-MC-4-Fix-Item-position-desync.patch b/patches/server/0030-MC-4-Fix-Item-position-desync.patch similarity index 100% rename from patches/server/0031-MC-4-Fix-Item-position-desync.patch rename to patches/server/0030-MC-4-Fix-Item-position-desync.patch diff --git a/patches/server/0032-Fix-vanilla-command-permission-handler.patch b/patches/server/0031-Fix-vanilla-command-permission-handler.patch similarity index 100% rename from patches/server/0032-Fix-vanilla-command-permission-handler.patch rename to patches/server/0031-Fix-vanilla-command-permission-handler.patch diff --git a/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0032-Logger-settings-suppressing-pointless-logs.patch similarity index 100% rename from patches/server/0033-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0032-Logger-settings-suppressing-pointless-logs.patch diff --git a/patches/server/0034-Disable-outdated-build-check.patch b/patches/server/0033-Disable-outdated-build-check.patch similarity index 97% rename from patches/server/0034-Disable-outdated-build-check.patch rename to patches/server/0033-Disable-outdated-build-check.patch index 6a3b793c4..f81bd8fea 100644 --- a/patches/server/0034-Disable-outdated-build-check.patch +++ b/patches/server/0033-Disable-outdated-build-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index bdb87ffac..bc47e4306 100644 +index 3261d2255..2825f5a3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -259,7 +259,7 @@ public class Main { diff --git a/patches/server/0035-Giants-AI-settings.patch b/patches/server/0034-Giants-AI-settings.patch similarity index 97% rename from patches/server/0035-Giants-AI-settings.patch rename to patches/server/0034-Giants-AI-settings.patch index f95656395..2a7b924a6 100644 --- a/patches/server/0035-Giants-AI-settings.patch +++ b/patches/server/0034-Giants-AI-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Giants AI settings diff --git a/src/main/java/net/minecraft/server/AttributeMapBase.java b/src/main/java/net/minecraft/server/AttributeMapBase.java -index c57e23e16b..92aa104dc5 100644 +index c57e23e16..92aa104dc 100644 --- a/src/main/java/net/minecraft/server/AttributeMapBase.java +++ b/src/main/java/net/minecraft/server/AttributeMapBase.java @@ -41,6 +41,7 @@ public class AttributeMapBase { @@ -17,7 +17,7 @@ index c57e23e16b..92aa104dc5 100644 public AttributeModifiable a(AttributeBase attributebase) { return (AttributeModifiable) this.b.computeIfAbsent(attributebase, (attributebase1) -> { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6c0d8fdaf2..fa60014088 100644 +index 958f361a5..1b8d9f129 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -137,7 +137,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -30,7 +30,7 @@ index 6c0d8fdaf2..fa60014088 100644 public float I; protected final Random random; diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java -index 9f4f56c47e..8dce2aad77 100644 +index 9f4f56c47..8dce2aad7 100644 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java @@ -4,9 +4,68 @@ public class EntityGiantZombie extends EntityMonster { @@ -112,7 +112,7 @@ index 9f4f56c47e..8dce2aad77 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 36df27024c..b7fcade369 100644 +index 36df27024..b7fcade36 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -939,6 +939,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -146,7 +146,7 @@ index 36df27024c..b7fcade369 100644 return false; } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 17128d5aae..82cf853ab3 100644 +index 17128d5aa..82cf853ab 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2148,7 +2148,7 @@ public abstract class EntityLiving extends Entity { @@ -159,7 +159,7 @@ index 17128d5aae..82cf853ab3 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 88e2715744..b1aca65267 100644 +index 88e271574..b1aca6526 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -106,6 +106,23 @@ public class PurpurWorldConfig { diff --git a/patches/server/0036-Illusioners-AI-settings.patch b/patches/server/0035-Illusioners-AI-settings.patch similarity index 100% rename from patches/server/0036-Illusioners-AI-settings.patch rename to patches/server/0035-Illusioners-AI-settings.patch diff --git a/patches/server/0037-Zombie-horse-naturally-spawn.patch b/patches/server/0036-Zombie-horse-naturally-spawn.patch similarity index 98% rename from patches/server/0037-Zombie-horse-naturally-spawn.patch rename to patches/server/0036-Zombie-horse-naturally-spawn.patch index 2ac061de3..c99324243 100644 --- a/patches/server/0037-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0036-Zombie-horse-naturally-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5cc5b609c..699a03a9e 100644 +index ebf78f2cc..646f9180f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1053,12 +1053,18 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0038-Charged-creeper-naturally-spawn.patch b/patches/server/0037-Charged-creeper-naturally-spawn.patch similarity index 100% rename from patches/server/0038-Charged-creeper-naturally-spawn.patch rename to patches/server/0037-Charged-creeper-naturally-spawn.patch diff --git a/patches/server/0039-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0038-Rabbit-naturally-spawn-toast-and-killer.patch similarity index 100% rename from patches/server/0039-Rabbit-naturally-spawn-toast-and-killer.patch rename to patches/server/0038-Rabbit-naturally-spawn-toast-and-killer.patch diff --git a/patches/server/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0039-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0039-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0041-Make-Iron-Golems-Swim.patch b/patches/server/0040-Make-Iron-Golems-Swim.patch similarity index 100% rename from patches/server/0041-Make-Iron-Golems-Swim.patch rename to patches/server/0040-Make-Iron-Golems-Swim.patch diff --git a/patches/server/0042-Dont-send-useless-entity-packets.patch b/patches/server/0041-Dont-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0042-Dont-send-useless-entity-packets.patch rename to patches/server/0041-Dont-send-useless-entity-packets.patch diff --git a/patches/server/0043-Tulips-change-fox-type.patch b/patches/server/0042-Tulips-change-fox-type.patch similarity index 100% rename from patches/server/0043-Tulips-change-fox-type.patch rename to patches/server/0042-Tulips-change-fox-type.patch diff --git a/patches/server/0044-Breedable-Polar-Bears.patch b/patches/server/0043-Breedable-Polar-Bears.patch similarity index 100% rename from patches/server/0044-Breedable-Polar-Bears.patch rename to patches/server/0043-Breedable-Polar-Bears.patch diff --git a/patches/server/0045-Chickens-can-retaliate.patch b/patches/server/0044-Chickens-can-retaliate.patch similarity index 100% rename from patches/server/0045-Chickens-can-retaliate.patch rename to patches/server/0044-Chickens-can-retaliate.patch diff --git a/patches/server/0046-Add-option-to-set-armorstand-step-height.patch b/patches/server/0045-Add-option-to-set-armorstand-step-height.patch similarity index 100% rename from patches/server/0046-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0045-Add-option-to-set-armorstand-step-height.patch diff --git a/patches/server/0047-Cat-spawning-options.patch b/patches/server/0046-Cat-spawning-options.patch similarity index 100% rename from patches/server/0047-Cat-spawning-options.patch rename to patches/server/0046-Cat-spawning-options.patch diff --git a/patches/server/0048-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0047-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch similarity index 100% rename from patches/server/0048-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch rename to patches/server/0047-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch diff --git a/patches/server/0049-Cows-eat-mushrooms.patch b/patches/server/0048-Cows-eat-mushrooms.patch similarity index 98% rename from patches/server/0049-Cows-eat-mushrooms.patch rename to patches/server/0048-Cows-eat-mushrooms.patch index 73483e2b4..0593cdb98 100644 --- a/patches/server/0049-Cows-eat-mushrooms.patch +++ b/patches/server/0048-Cows-eat-mushrooms.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cows eat mushrooms diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index fa60014088..74d26aad1d 100644 +index 1b8d9f129..449cf9d77 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2724,6 +2724,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index fa60014088..74d26aad1d 100644 this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch); } diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 42e6761c8b..cfb009c811 100644 +index 42e6761c8..cfb009c81 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal { @@ -110,7 +110,7 @@ index 42e6761c8b..cfb009c811 100644 public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) { return (EntityCow) EntityTypes.COW.a((World) worldserver); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 82cf853ab3..5e9849a466 100644 +index 82cf853ab..5e9849a46 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity { @@ -123,7 +123,7 @@ index 82cf853ab3..5e9849a466 100644 public float aC; public float aD; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 55e609cc1c..3d78ac90c1 100644 +index 55e609cc1..3d78ac90c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -125,6 +125,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0050-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0049-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0050-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0049-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0051-Pigs-give-saddle-back.patch b/patches/server/0050-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0051-Pigs-give-saddle-back.patch rename to patches/server/0050-Pigs-give-saddle-back.patch diff --git a/patches/server/0052-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0051-Snowman-drop-and-put-back-pumpkin.patch similarity index 100% rename from patches/server/0052-Snowman-drop-and-put-back-pumpkin.patch rename to patches/server/0051-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0053-Ender-dragon-always-drop-egg.patch b/patches/server/0052-Ender-dragon-always-drop-egg.patch similarity index 100% rename from patches/server/0053-Ender-dragon-always-drop-egg.patch rename to patches/server/0052-Ender-dragon-always-drop-egg.patch diff --git a/patches/server/0054-Ender-dragon-always-drop-full-exp.patch b/patches/server/0053-Ender-dragon-always-drop-full-exp.patch similarity index 100% rename from patches/server/0054-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0053-Ender-dragon-always-drop-full-exp.patch diff --git a/patches/server/0055-Signs-editable-on-right-click.patch b/patches/server/0054-Signs-editable-on-right-click.patch similarity index 100% rename from patches/server/0055-Signs-editable-on-right-click.patch rename to patches/server/0054-Signs-editable-on-right-click.patch diff --git a/patches/server/0056-Signs-allow-color-codes.patch b/patches/server/0055-Signs-allow-color-codes.patch similarity index 99% rename from patches/server/0056-Signs-allow-color-codes.patch rename to patches/server/0055-Signs-allow-color-codes.patch index b0c5adaa6..ad9c0ddd5 100644 --- a/patches/server/0056-Signs-allow-color-codes.patch +++ b/patches/server/0055-Signs-allow-color-codes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2738194fc..66e786b25 100644 +index 71d2a658d..7fad63234 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1243,6 +1243,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0057-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0056-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 100% rename from patches/server/0057-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0056-Allow-soil-to-moisten-from-water-directly-under-it.patch diff --git a/patches/server/0058-Controllable-Minecarts.patch b/patches/server/0057-Controllable-Minecarts.patch similarity index 100% rename from patches/server/0058-Controllable-Minecarts.patch rename to patches/server/0057-Controllable-Minecarts.patch diff --git a/patches/server/0059-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0058-Disable-loot-drops-on-death-by-cramming.patch similarity index 100% rename from patches/server/0059-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0058-Disable-loot-drops-on-death-by-cramming.patch diff --git a/patches/server/0060-Players-should-not-cram-to-death.patch b/patches/server/0059-Players-should-not-cram-to-death.patch similarity index 96% rename from patches/server/0060-Players-should-not-cram-to-death.patch rename to patches/server/0059-Players-should-not-cram-to-death.patch index 8bdfab745..27c07fd21 100644 --- a/patches/server/0060-Players-should-not-cram-to-death.patch +++ b/patches/server/0059-Players-should-not-cram-to-death.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 66e786b25..47f48d3b7 100644 +index 7fad63234..65c241d88 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1219,7 +1219,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0061-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0060-Option-to-toggle-milk-curing-bad-omen.patch similarity index 100% rename from patches/server/0061-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0060-Option-to-toggle-milk-curing-bad-omen.patch diff --git a/patches/server/0062-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0061-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0062-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0061-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0063-Debug-stick-should-not-update-neighbors.patch b/patches/server/0062-Debug-stick-should-not-update-neighbors.patch similarity index 100% rename from patches/server/0063-Debug-stick-should-not-update-neighbors.patch rename to patches/server/0062-Debug-stick-should-not-update-neighbors.patch diff --git a/patches/server/0064-Fix-reloading-paper.yml.patch b/patches/server/0063-Fix-reloading-paper.yml.patch similarity index 100% rename from patches/server/0064-Fix-reloading-paper.yml.patch rename to patches/server/0063-Fix-reloading-paper.yml.patch diff --git a/patches/server/0065-Fix-the-dead-lagging-the-server.patch b/patches/server/0064-Fix-the-dead-lagging-the-server.patch similarity index 95% rename from patches/server/0065-Fix-the-dead-lagging-the-server.patch rename to patches/server/0064-Fix-the-dead-lagging-the-server.patch index 9ad5e2d0d..5bf730a59 100644 --- a/patches/server/0065-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0064-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/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 74d26aad1d..8bc2e7c988 100644 +index 449cf9d77..6d809cc78 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1501,6 +1501,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index 74d26aad1d..8bc2e7c988 100644 public void f(double d0, double d1, double d2) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 618faae958..51b2aa3e20 100644 +index 618faae95..51b2aa3e2 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2466,7 +2466,7 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0066-Skip-events-if-there-s-no-listeners.patch b/patches/server/0065-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0066-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0065-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0067-Add-permission-for-F3-N-debug.patch b/patches/server/0066-Add-permission-for-F3-N-debug.patch similarity index 95% rename from patches/server/0067-Add-permission-for-F3-N-debug.patch rename to patches/server/0066-Add-permission-for-F3-N-debug.patch index 3863a0c31..6acb92e3d 100644 --- a/patches/server/0067-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0066-Add-permission-for-F3-N-debug.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 75b0565df..8c66471ad 100644 +index 83219d657..8757711e9 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1057,6 +1057,7 @@ public abstract class PlayerList { diff --git a/patches/server/0068-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0067-Add-wither-skeleton-takes-wither-damage-option.patch similarity index 100% rename from patches/server/0068-Add-wither-skeleton-takes-wither-damage-option.patch rename to patches/server/0067-Add-wither-skeleton-takes-wither-damage-option.patch diff --git a/patches/server/0069-Configurable-TPS-Catchup.patch b/patches/server/0068-Configurable-TPS-Catchup.patch similarity index 100% rename from patches/server/0069-Configurable-TPS-Catchup.patch rename to patches/server/0068-Configurable-TPS-Catchup.patch diff --git a/patches/server/0070-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0069-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 100% rename from patches/server/0070-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0069-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch diff --git a/patches/server/0071-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0070-Add-enderman-and-creeper-griefing-controls.patch similarity index 100% rename from patches/server/0071-Add-enderman-and-creeper-griefing-controls.patch rename to patches/server/0070-Add-enderman-and-creeper-griefing-controls.patch diff --git a/patches/server/0072-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0071-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch similarity index 100% rename from patches/server/0072-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch rename to patches/server/0071-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch diff --git a/patches/server/0073-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0072-Villagers-farming-can-bypass-mob-griefing-gamerule.patch similarity index 100% rename from patches/server/0073-Villagers-farming-can-bypass-mob-griefing-gamerule.patch rename to patches/server/0072-Villagers-farming-can-bypass-mob-griefing-gamerule.patch diff --git a/patches/server/0074-Villagers-follow-emerald-blocks.patch b/patches/server/0073-Villagers-follow-emerald-blocks.patch similarity index 100% rename from patches/server/0074-Villagers-follow-emerald-blocks.patch rename to patches/server/0073-Villagers-follow-emerald-blocks.patch diff --git a/patches/server/0075-Allow-leashing-villagers.patch b/patches/server/0074-Allow-leashing-villagers.patch similarity index 100% rename from patches/server/0075-Allow-leashing-villagers.patch rename to patches/server/0074-Allow-leashing-villagers.patch diff --git a/patches/server/0076-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0075-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0076-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0075-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0077-Implement-infinite-lava.patch b/patches/server/0076-Implement-infinite-lava.patch similarity index 100% rename from patches/server/0077-Implement-infinite-lava.patch rename to patches/server/0076-Implement-infinite-lava.patch diff --git a/patches/server/0078-Make-lava-flow-speed-configurable.patch b/patches/server/0077-Make-lava-flow-speed-configurable.patch similarity index 100% rename from patches/server/0078-Make-lava-flow-speed-configurable.patch rename to patches/server/0077-Make-lava-flow-speed-configurable.patch diff --git a/patches/server/0079-Add-player-death-exp-control-options.patch b/patches/server/0078-Add-player-death-exp-control-options.patch similarity index 100% rename from patches/server/0079-Add-player-death-exp-control-options.patch rename to patches/server/0078-Add-player-death-exp-control-options.patch diff --git a/patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0079-Add-option-to-disable-saving-projectiles-to-disk.patch similarity index 100% rename from patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch rename to patches/server/0079-Add-option-to-disable-saving-projectiles-to-disk.patch diff --git a/patches/server/0081-Configurable-void-damage-height.patch b/patches/server/0080-Configurable-void-damage-height.patch similarity index 97% rename from patches/server/0081-Configurable-void-damage-height.patch rename to patches/server/0080-Configurable-void-damage-height.patch index 21c0c2c05..45c662765 100644 --- a/patches/server/0081-Configurable-void-damage-height.patch +++ b/patches/server/0080-Configurable-void-damage-height.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e208190073..305b63b295 100644 +index 15e5fc122..4f87d1312 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -612,7 +612,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index e208190073..305b63b295 100644 && this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) { this.doVoidDamage(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6ac7862063..a071129db0 100644 +index 6ac786206..a071129db 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -115,12 +115,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0082-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0081-Add-option-for-zombies-targetting-turtle-eggs.patch similarity index 100% rename from patches/server/0082-Add-option-for-zombies-targetting-turtle-eggs.patch rename to patches/server/0081-Add-option-for-zombies-targetting-turtle-eggs.patch diff --git a/patches/server/0083-Dispenser-curse-of-binding-protection.patch b/patches/server/0082-Dispenser-curse-of-binding-protection.patch similarity index 100% rename from patches/server/0083-Dispenser-curse-of-binding-protection.patch rename to patches/server/0082-Dispenser-curse-of-binding-protection.patch diff --git a/patches/server/0084-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0083-Add-option-for-boats-to-eject-players-on-land.patch similarity index 100% rename from patches/server/0084-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0083-Add-option-for-boats-to-eject-players-on-land.patch diff --git a/patches/server/0085-Add-obfhelpers-for-plugin-use.patch b/patches/server/0084-Add-obfhelpers-for-plugin-use.patch similarity index 100% rename from patches/server/0085-Add-obfhelpers-for-plugin-use.patch rename to patches/server/0084-Add-obfhelpers-for-plugin-use.patch diff --git a/patches/server/0086-Mending-mends-most-damages-equipment-first.patch b/patches/server/0085-Mending-mends-most-damages-equipment-first.patch similarity index 100% rename from patches/server/0086-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0085-Mending-mends-most-damages-equipment-first.patch diff --git a/patches/server/0087-Implement-bamboo-growth-settings.patch b/patches/server/0086-Implement-bamboo-growth-settings.patch similarity index 100% rename from patches/server/0087-Implement-bamboo-growth-settings.patch rename to patches/server/0086-Implement-bamboo-growth-settings.patch diff --git a/patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0087-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0087-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0089-Add-5-second-tps-average-in-tps.patch b/patches/server/0088-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0089-Add-5-second-tps-average-in-tps.patch rename to patches/server/0088-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0090-Implement-elytra-settings.patch b/patches/server/0089-Implement-elytra-settings.patch similarity index 99% rename from patches/server/0090-Implement-elytra-settings.patch rename to patches/server/0089-Implement-elytra-settings.patch index 9a3ec8bbe..1a7840eb1 100644 --- a/patches/server/0090-Implement-elytra-settings.patch +++ b/patches/server/0089-Implement-elytra-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 9398fa680..a187a16ce 100644 +index 788175110..2c90e7835 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2825,7 +2825,16 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0091-Item-entity-immunities.patch b/patches/server/0090-Item-entity-immunities.patch similarity index 100% rename from patches/server/0091-Item-entity-immunities.patch rename to patches/server/0090-Item-entity-immunities.patch diff --git a/patches/server/0092-Add-ping-command.patch b/patches/server/0091-Add-ping-command.patch similarity index 97% rename from patches/server/0092-Add-ping-command.patch rename to patches/server/0091-Add-ping-command.patch index 2a2b5f461..7cf931345 100644 --- a/patches/server/0092-Add-ping-command.patch +++ b/patches/server/0091-Add-ping-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add /ping command diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java -index 1194f91a51..9141976d1d 100644 +index 1194f91a5..9141976d1 100644 --- a/src/main/java/net/minecraft/server/ArgumentEntity.java +++ b/src/main/java/net/minecraft/server/ArgumentEntity.java @@ -69,10 +69,12 @@ public class ArgumentEntity implements ArgumentType { @@ -22,7 +22,7 @@ index 1194f91a51..9141976d1d 100644 List list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource()); diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java -index cabce1a8ba..0ad72570f0 100644 +index cabce1a8b..0ad72570f 100644 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java @@ -107,6 +107,7 @@ public class CommandDispatcher { @@ -55,7 +55,7 @@ index cabce1a8ba..0ad72570f0 100644 return this.b; } diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java -index 90b0cf6470..6f43dfc103 100644 +index 90b0cf647..6f43dfc10 100644 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java @@ -189,6 +189,7 @@ public class CommandListenerWrapper implements ICompletionProvider, com.destroys @@ -67,7 +67,7 @@ index 90b0cf6470..6f43dfc103 100644 if (!(this.k instanceof EntityPlayer)) { throw CommandListenerWrapper.a.create(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index a49807916d..10fdbf4967 100644 +index a49807916..10fdbf496 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,10 +133,12 @@ public class PurpurConfig { @@ -85,7 +85,7 @@ index a49807916d..10fdbf4967 100644 public static String serverModName = "Purpur"; diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java new file mode 100644 -index 0000000000..c6499ad3ca +index 000000000..c6499ad3c --- /dev/null +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java @@ -0,0 +1,37 @@ diff --git a/patches/server/0093-Configurable-jockey-options.patch b/patches/server/0092-Configurable-jockey-options.patch similarity index 100% rename from patches/server/0093-Configurable-jockey-options.patch rename to patches/server/0092-Configurable-jockey-options.patch diff --git a/patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0093-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 98% rename from patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0093-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 3234191b1..1e2f15a08 100644 --- a/patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0093-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java -index 6fe5678cff..bd0267ee4b 100644 +index 6fe5678cf..bd0267ee4 100644 --- a/src/main/java/net/minecraft/server/DamageSource.java +++ b/src/main/java/net/minecraft/server/DamageSource.java @@ -88,6 +88,7 @@ public class DamageSource { @@ -17,7 +17,7 @@ index 6fe5678cff..bd0267ee4b 100644 return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic(); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7b3ea5c741..26cefeb23c 100644 +index 6c64f86b7..92270427d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1568,6 +1568,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -40,7 +40,7 @@ index 7b3ea5c741..26cefeb23c 100644 } diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java -index faa82f6524..f726a3585f 100644 +index 362ca695d..1942fae27 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity { @@ -108,7 +108,7 @@ index faa82f6524..f726a3585f 100644 @Override protected void saveData(NBTTagCompound nbttagcompound) { diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 550f80bfdb..b3616185d2 100644 +index 550f80bfd..b3616185d 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -9,9 +9,10 @@ import javax.annotation.Nullable; @@ -329,7 +329,7 @@ index 550f80bfdb..b3616185d2 100644 return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3e067c832f..f2ca515c9b 100644 +index 3e067c832..f2ca515c9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -324,6 +324,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0095-Customizable-EnderDragon-Health.patch b/patches/server/0094-Customizable-EnderDragon-Health.patch similarity index 100% rename from patches/server/0095-Customizable-EnderDragon-Health.patch rename to patches/server/0094-Customizable-EnderDragon-Health.patch diff --git a/patches/server/0096-Add-phantom-spawning-options.patch b/patches/server/0095-Add-phantom-spawning-options.patch similarity index 100% rename from patches/server/0096-Add-phantom-spawning-options.patch rename to patches/server/0095-Add-phantom-spawning-options.patch diff --git a/patches/server/0097-Implement-bed-explosion-options.patch b/patches/server/0096-Implement-bed-explosion-options.patch similarity index 100% rename from patches/server/0097-Implement-bed-explosion-options.patch rename to patches/server/0096-Implement-bed-explosion-options.patch diff --git a/patches/server/0098-Implement-respawn-anchor-explosion-options.patch b/patches/server/0097-Implement-respawn-anchor-explosion-options.patch similarity index 100% rename from patches/server/0098-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0097-Implement-respawn-anchor-explosion-options.patch diff --git a/patches/server/0099-Add-allow-water-in-end-world-option.patch b/patches/server/0098-Add-allow-water-in-end-world-option.patch similarity index 100% rename from patches/server/0099-Add-allow-water-in-end-world-option.patch rename to patches/server/0098-Add-allow-water-in-end-world-option.patch diff --git a/patches/server/0100-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch b/patches/server/0099-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch similarity index 100% rename from patches/server/0100-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch rename to patches/server/0099-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch diff --git a/patches/server/0101-ALlow-color-codes-in-books.patch b/patches/server/0100-ALlow-color-codes-in-books.patch similarity index 100% rename from patches/server/0101-ALlow-color-codes-in-books.patch rename to patches/server/0100-ALlow-color-codes-in-books.patch diff --git a/patches/server/0102-Entity-lifespan.patch b/patches/server/0101-Entity-lifespan.patch similarity index 100% rename from patches/server/0102-Entity-lifespan.patch rename to patches/server/0101-Entity-lifespan.patch diff --git a/patches/server/0103-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0102-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 98% rename from patches/server/0103-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0102-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index c48cc90ad..c67d776a3 100644 --- a/patches/server/0103-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0102-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a187a16ce..e697f7e4a 100644 +index 2c90e7835..61a74e296 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -277,6 +277,13 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0104-Squid-EAR-immunity.patch b/patches/server/0103-Squid-EAR-immunity.patch similarity index 100% rename from patches/server/0104-Squid-EAR-immunity.patch rename to patches/server/0103-Squid-EAR-immunity.patch diff --git a/patches/server/0105-Configurable-end-spike-seed.patch b/patches/server/0104-Configurable-end-spike-seed.patch similarity index 100% rename from patches/server/0105-Configurable-end-spike-seed.patch rename to patches/server/0104-Configurable-end-spike-seed.patch diff --git a/patches/server/0106-Configurable-dungeon-seed.patch b/patches/server/0105-Configurable-dungeon-seed.patch similarity index 100% rename from patches/server/0106-Configurable-dungeon-seed.patch rename to patches/server/0105-Configurable-dungeon-seed.patch diff --git a/patches/server/0107-Phantoms-burn-in-light.patch b/patches/server/0106-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0107-Phantoms-burn-in-light.patch rename to patches/server/0106-Phantoms-burn-in-light.patch diff --git a/patches/server/0108-Configurable-villager-breeding.patch b/patches/server/0107-Configurable-villager-breeding.patch similarity index 100% rename from patches/server/0108-Configurable-villager-breeding.patch rename to patches/server/0107-Configurable-villager-breeding.patch diff --git a/patches/server/0109-Redstone-deactivates-spawners.patch b/patches/server/0108-Redstone-deactivates-spawners.patch similarity index 100% rename from patches/server/0109-Redstone-deactivates-spawners.patch rename to patches/server/0108-Redstone-deactivates-spawners.patch diff --git a/patches/server/0110-Totems-work-in-inventory.patch b/patches/server/0109-Totems-work-in-inventory.patch similarity index 98% rename from patches/server/0110-Totems-work-in-inventory.patch rename to patches/server/0109-Totems-work-in-inventory.patch index 859895884..8f5d0b8f9 100644 --- a/patches/server/0110-Totems-work-in-inventory.patch +++ b/patches/server/0109-Totems-work-in-inventory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e697f7e4a..8071816d1 100644 +index 61a74e296..a90d3fa3e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1324,6 +1324,19 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0111-Fix-death-message-colors.patch b/patches/server/0110-Fix-death-message-colors.patch similarity index 98% rename from patches/server/0111-Fix-death-message-colors.patch rename to patches/server/0110-Fix-death-message-colors.patch index 609dc60af..2f65e23e7 100644 --- a/patches/server/0111-Fix-death-message-colors.patch +++ b/patches/server/0110-Fix-death-message-colors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix death message colors diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index e524705bf..60f68e480 100644 +index 9b6e356bb..85e77a61f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -667,7 +667,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0112-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch b/patches/server/0111-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch similarity index 100% rename from patches/server/0112-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch rename to patches/server/0111-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch diff --git a/patches/server/0113-Populator-seed-controls.patch b/patches/server/0112-Populator-seed-controls.patch similarity index 100% rename from patches/server/0113-Populator-seed-controls.patch rename to patches/server/0112-Populator-seed-controls.patch diff --git a/patches/server/0114-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0113-Add-vindicator-johnny-spawn-chance.patch similarity index 100% rename from patches/server/0114-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0113-Add-vindicator-johnny-spawn-chance.patch diff --git a/patches/server/0115-DragonEggPlaceEvent.patch b/patches/server/0114-DragonEggPlaceEvent.patch similarity index 100% rename from patches/server/0115-DragonEggPlaceEvent.patch rename to patches/server/0114-DragonEggPlaceEvent.patch diff --git a/patches/server/0116-Add-option-to-disable-mushroom-block-updates.patch b/patches/server/0115-Add-option-to-disable-mushroom-block-updates.patch similarity index 100% rename from patches/server/0116-Add-option-to-disable-mushroom-block-updates.patch rename to patches/server/0115-Add-option-to-disable-mushroom-block-updates.patch diff --git a/patches/server/0117-PaperMC-Buffer-joins.patch b/patches/server/0116-PaperMC-Buffer-joins.patch similarity index 100% rename from patches/server/0117-PaperMC-Buffer-joins.patch rename to patches/server/0116-PaperMC-Buffer-joins.patch diff --git a/patches/server/0118-Dispensers-place-anvils-option.patch b/patches/server/0117-Dispensers-place-anvils-option.patch similarity index 100% rename from patches/server/0118-Dispensers-place-anvils-option.patch rename to patches/server/0117-Dispensers-place-anvils-option.patch diff --git a/patches/server/0119-Allow-anvil-colors.patch b/patches/server/0118-Allow-anvil-colors.patch similarity index 100% rename from patches/server/0119-Allow-anvil-colors.patch rename to patches/server/0118-Allow-anvil-colors.patch diff --git a/patches/server/0120-Add-no-tick-block-list.patch b/patches/server/0119-Add-no-tick-block-list.patch similarity index 99% rename from patches/server/0120-Add-no-tick-block-list.patch rename to patches/server/0119-Add-no-tick-block-list.patch index 2896a8d73..117200f94 100644 --- a/patches/server/0120-Add-no-tick-block-list.patch +++ b/patches/server/0119-Add-no-tick-block-list.patch @@ -22,7 +22,7 @@ index 82e07b357..05a7422fb 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 004cc8616..5e4ccb066 100644 +index 53ab03a29..e4f2b8494 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -305,14 +305,14 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0121-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0120-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0121-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0120-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0122-Add-option-to-reset-reputation-when-villager-is-cure.patch b/patches/server/0121-Add-option-to-reset-reputation-when-villager-is-cure.patch similarity index 100% rename from patches/server/0122-Add-option-to-reset-reputation-when-villager-is-cure.patch rename to patches/server/0121-Add-option-to-reset-reputation-when-villager-is-cure.patch diff --git a/patches/server/0123-Optimize-redstone-algorithm.patch b/patches/server/0122-Optimize-redstone-algorithm.patch similarity index 99% rename from patches/server/0123-Optimize-redstone-algorithm.patch rename to patches/server/0122-Optimize-redstone-algorithm.patch index 0117bbf67..8536956e0 100644 --- a/patches/server/0123-Optimize-redstone-algorithm.patch +++ b/patches/server/0122-Optimize-redstone-algorithm.patch @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index fedea81067..56f1b4b5d2 100644 +index fedea8106..56f1b4b5d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -655,4 +655,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index fedea81067..56f1b4b5d2 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java new file mode 100644 -index 0000000000..b69803cbf2 +index 000000000..b69803cbf --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,915 @@ @@ -959,7 +959,7 @@ index 0000000000..b69803cbf2 + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 7b3ccded04..7f9ca45d40 100644 +index 7b3ccded0..7f9ca45d4 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1138,7 +1138,7 @@ index 7b3ccded04..7f9ca45d40 100644 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6cc37f5b99..a4bb581367 100644 +index 6cc37f5b9..a4bb58136 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -614,6 +614,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/patches/server/0124-Short-enderman-height.patch b/patches/server/0123-Short-enderman-height.patch similarity index 100% rename from patches/server/0124-Short-enderman-height.patch rename to patches/server/0123-Short-enderman-height.patch diff --git a/patches/server/0125-Stop-squids-floating-on-top-of-water.patch b/patches/server/0124-Stop-squids-floating-on-top-of-water.patch similarity index 95% rename from patches/server/0125-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0124-Stop-squids-floating-on-top-of-water.patch index 60a52a360..d6a46cfff 100644 --- a/patches/server/0125-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0124-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/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 26cefeb23c..26a08b9520 100644 +index 92270427d..7a6283897 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -3394,8 +3394,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -24,7 +24,7 @@ index 26cefeb23c..26a08b9520 100644 int j = MathHelper.f(axisalignedbb.maxX); int k = MathHelper.floor(axisalignedbb.minY); diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 03d707ed09..028a7fe2cd 100644 +index 03d707ed0..028a7fe2c 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -25,6 +25,14 @@ public class EntitySquid extends EntityWaterAnimal { @@ -43,7 +43,7 @@ index 03d707ed09..028a7fe2cd 100644 protected void initPathfinder() { this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6329b1c507..421781136c 100644 +index 6329b1c50..421781136 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -476,8 +476,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0126-Ridables.patch b/patches/server/0125-Ridables.patch similarity index 99% rename from patches/server/0126-Ridables.patch rename to patches/server/0125-Ridables.patch index 14d6dcc53..8036c53e0 100644 --- a/patches/server/0126-Ridables.patch +++ b/patches/server/0125-Ridables.patch @@ -2362,7 +2362,7 @@ index bdff23688..954000a7b 100644 float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 8071816d1..0d9dcd6b2 100644 +index a90d3fa3e..a92c52b5f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -465,7 +465,7 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0127-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0126-Use-configured-height-for-nether-surface-builders.patch similarity index 97% rename from patches/server/0127-Use-configured-height-for-nether-surface-builders.patch rename to patches/server/0126-Use-configured-height-for-nether-surface-builders.patch index e384c6093..3557fecd5 100644 --- a/patches/server/0127-Use-configured-height-for-nether-surface-builders.patch +++ b/patches/server/0126-Use-configured-height-for-nether-surface-builders.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use configured height for nether surface builders diff --git a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java -index 462f0b2bae..f418a71ca8 100644 +index 462f0b2ba..f418a71ca 100644 --- a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java +++ b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java @@ -35,7 +35,7 @@ public abstract class WorldGenSurfaceNetherAbstract extends WorldGenSurface