diff --git a/patches/api/0014-EMC-MonsterEggSpawnEvent.patch b/patches/api/0014-EMC-MonsterEggSpawnEvent.patch deleted file mode 100644 index 445f4a940..000000000 --- a/patches/api/0014-EMC-MonsterEggSpawnEvent.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Mon, 21 Nov 2016 17:02:11 -0500 -Subject: [PATCH] EMC - MonsterEggSpawnEvent - - -diff --git a/src/main/java/org/purpurmc/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/MonsterEggSpawnEvent.java -new file mode 100644 -index 0000000000000000000000000000000000000000..82f8a0ea22f07954d516935fc9f73f6aa0f65aa6 ---- /dev/null -+++ b/src/main/java/org/purpurmc/purpur/event/entity/MonsterEggSpawnEvent.java -@@ -0,0 +1,67 @@ -+package org.purpurmc.purpur.event.entity; -+ -+import org.bukkit.entity.Entity; -+import org.bukkit.entity.HumanEntity; -+import org.bukkit.entity.Player; -+import org.bukkit.event.Cancellable; -+import org.bukkit.event.Event; -+import org.bukkit.event.HandlerList; -+import org.bukkit.inventory.ItemStack; -+import org.jetbrains.annotations.NotNull; -+import org.jetbrains.annotations.Nullable; -+ -+public class MonsterEggSpawnEvent extends Event implements Cancellable { -+ private static final HandlerList handlers = new HandlerList(); -+ private boolean canceled; -+ -+ private final Player player; -+ private Entity entity; -+ private final ItemStack item; -+ -+ public MonsterEggSpawnEvent(@Nullable HumanEntity player, @NotNull Entity entity, @NotNull ItemStack item) { -+ this.player = (Player) player; -+ this.entity = entity; -+ this.item = item; -+ } -+ -+ @Nullable -+ public Player getPlayer() { -+ return player; -+ } -+ -+ @NotNull -+ public Entity getEntity() { -+ return entity; -+ } -+ -+ public void setEntity(@Nullable Entity entity) { -+ if (entity == null) { -+ canceled = true; -+ return; -+ } -+ this.entity = entity; -+ } -+ -+ @NotNull -+ public ItemStack getItem() { -+ return item; -+ } -+ -+ public boolean isCancelled() { -+ return canceled; -+ } -+ -+ public void setCancelled(boolean cancel) { -+ canceled = cancel; -+ } -+ -+ @NotNull -+ public HandlerList getHandlers() { -+ return handlers; -+ } -+ -+ @NotNull -+ public static HandlerList getHandlerList() { -+ return handlers; -+ } -+} diff --git a/patches/api/0015-Player-invulnerabilities.patch b/patches/api/0014-Player-invulnerabilities.patch similarity index 92% rename from patches/api/0015-Player-invulnerabilities.patch rename to patches/api/0014-Player-invulnerabilities.patch index b47d88423..fc06b006d 100644 --- a/patches/api/0015-Player-invulnerabilities.patch +++ b/patches/api/0014-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 5a303d33de32ce3c7480ab866703f70d1968b84b..4d95ddbba22b7fdadec3cd880fd9acde92b515c3 100644 +index 1e8bc00d487e20cd493b478a092e92bc1704e13e..a4d7e28302ffa2e2afa26caecf55d2be05c17382 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3101,5 +3101,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0016-Anvil-API.patch b/patches/api/0015-Anvil-API.patch similarity index 100% rename from patches/api/0016-Anvil-API.patch rename to patches/api/0015-Anvil-API.patch diff --git a/patches/api/0017-ItemStack-convenience-methods.patch b/patches/api/0016-ItemStack-convenience-methods.patch similarity index 100% rename from patches/api/0017-ItemStack-convenience-methods.patch rename to patches/api/0016-ItemStack-convenience-methods.patch diff --git a/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0017-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/api/0017-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/patches/api/0019-ChatColor-conveniences.patch b/patches/api/0018-ChatColor-conveniences.patch similarity index 100% rename from patches/api/0019-ChatColor-conveniences.patch rename to patches/api/0018-ChatColor-conveniences.patch diff --git a/patches/api/0020-LivingEntity-broadcastItemBreak.patch b/patches/api/0019-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/api/0020-LivingEntity-broadcastItemBreak.patch rename to patches/api/0019-LivingEntity-broadcastItemBreak.patch diff --git a/patches/api/0021-Item-entity-immunities.patch b/patches/api/0020-Item-entity-immunities.patch similarity index 100% rename from patches/api/0021-Item-entity-immunities.patch rename to patches/api/0020-Item-entity-immunities.patch diff --git a/patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/api/0021-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/api/0021-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/api/0023-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0022-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/api/0023-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/api/0022-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/api/0024-Rabid-Wolf-API.patch b/patches/api/0023-Rabid-Wolf-API.patch similarity index 100% rename from patches/api/0024-Rabid-Wolf-API.patch rename to patches/api/0023-Rabid-Wolf-API.patch diff --git a/patches/api/0025-PlayerBookTooLargeEvent.patch b/patches/api/0024-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/api/0025-PlayerBookTooLargeEvent.patch rename to patches/api/0024-PlayerBookTooLargeEvent.patch diff --git a/patches/api/0026-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0025-Full-netherite-armor-grants-fire-resistance.patch similarity index 100% rename from patches/api/0026-Full-netherite-armor-grants-fire-resistance.patch rename to patches/api/0025-Full-netherite-armor-grants-fire-resistance.patch diff --git a/patches/api/0027-Add-EntityTeleportHinderedEvent.patch b/patches/api/0026-Add-EntityTeleportHinderedEvent.patch similarity index 100% rename from patches/api/0027-Add-EntityTeleportHinderedEvent.patch rename to patches/api/0026-Add-EntityTeleportHinderedEvent.patch diff --git a/patches/api/0028-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0027-Add-enchantment-target-for-bows-and-crossbows.patch similarity index 100% rename from patches/api/0028-Add-enchantment-target-for-bows-and-crossbows.patch rename to patches/api/0027-Add-enchantment-target-for-bows-and-crossbows.patch diff --git a/patches/api/0029-Iron-golem-poppy-calms-anger.patch b/patches/api/0028-Iron-golem-poppy-calms-anger.patch similarity index 100% rename from patches/api/0029-Iron-golem-poppy-calms-anger.patch rename to patches/api/0028-Iron-golem-poppy-calms-anger.patch diff --git a/patches/api/0030-API-for-any-mob-to-burn-daylight.patch b/patches/api/0029-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/api/0030-API-for-any-mob-to-burn-daylight.patch rename to patches/api/0029-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/api/0031-Add-back-player-spawned-endermite-API.patch b/patches/api/0030-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/api/0031-Add-back-player-spawned-endermite-API.patch rename to patches/api/0030-Add-back-player-spawned-endermite-API.patch diff --git a/patches/api/0032-Fix-default-permission-system.patch b/patches/api/0031-Fix-default-permission-system.patch similarity index 100% rename from patches/api/0032-Fix-default-permission-system.patch rename to patches/api/0031-Fix-default-permission-system.patch diff --git a/patches/api/0033-Summoner-API.patch b/patches/api/0032-Summoner-API.patch similarity index 100% rename from patches/api/0033-Summoner-API.patch rename to patches/api/0032-Summoner-API.patch diff --git a/patches/api/0034-Clean-up-version-command-output.patch b/patches/api/0033-Clean-up-version-command-output.patch similarity index 100% rename from patches/api/0034-Clean-up-version-command-output.patch rename to patches/api/0033-Clean-up-version-command-output.patch diff --git a/patches/api/0035-Extended-OfflinePlayer-API.patch b/patches/api/0034-Extended-OfflinePlayer-API.patch similarity index 100% rename from patches/api/0035-Extended-OfflinePlayer-API.patch rename to patches/api/0034-Extended-OfflinePlayer-API.patch diff --git a/patches/api/0036-Added-the-ability-to-add-combustible-items.patch b/patches/api/0035-Added-the-ability-to-add-combustible-items.patch similarity index 100% rename from patches/api/0036-Added-the-ability-to-add-combustible-items.patch rename to patches/api/0035-Added-the-ability-to-add-combustible-items.patch diff --git a/patches/api/0037-Potion-NamespacedKey.patch b/patches/api/0036-Potion-NamespacedKey.patch similarity index 100% rename from patches/api/0037-Potion-NamespacedKey.patch rename to patches/api/0036-Potion-NamespacedKey.patch diff --git a/patches/api/0038-Grindstone-API.patch b/patches/api/0037-Grindstone-API.patch similarity index 100% rename from patches/api/0038-Grindstone-API.patch rename to patches/api/0037-Grindstone-API.patch diff --git a/patches/api/0039-Shears-can-have-looting-enchantment.patch b/patches/api/0038-Shears-can-have-looting-enchantment.patch similarity index 100% rename from patches/api/0039-Shears-can-have-looting-enchantment.patch rename to patches/api/0038-Shears-can-have-looting-enchantment.patch diff --git a/patches/api/0040-Lobotomize-stuck-villagers.patch b/patches/api/0039-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/api/0040-Lobotomize-stuck-villagers.patch rename to patches/api/0039-Lobotomize-stuck-villagers.patch diff --git a/patches/api/0041-Add-local-difficulty-api.patch b/patches/api/0040-Add-local-difficulty-api.patch similarity index 100% rename from patches/api/0041-Add-local-difficulty-api.patch rename to patches/api/0040-Add-local-difficulty-api.patch diff --git a/patches/api/0042-Remove-Timings.patch b/patches/api/0041-Remove-Timings.patch similarity index 100% rename from patches/api/0042-Remove-Timings.patch rename to patches/api/0041-Remove-Timings.patch diff --git a/patches/api/0043-Add-Bee-API.patch b/patches/api/0042-Add-Bee-API.patch similarity index 100% rename from patches/api/0043-Add-Bee-API.patch rename to patches/api/0042-Add-Bee-API.patch diff --git a/patches/api/0044-Debug-Marker-API.patch b/patches/api/0043-Debug-Marker-API.patch similarity index 99% rename from patches/api/0044-Debug-Marker-API.patch rename to patches/api/0043-Debug-Marker-API.patch index 42b3c96f8..9a3070294 100644 --- a/patches/api/0044-Debug-Marker-API.patch +++ b/patches/api/0043-Debug-Marker-API.patch @@ -260,7 +260,7 @@ index d07b6f40c111c9b131f2995e9796d66f5344c5df..adf8169d5baefa7a33c33ef066180a81 /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 4d95ddbba22b7fdadec3cd880fd9acde92b515c3..bb62037ea111f27bed78001ec2e179cc69e0084e 100644 +index a4d7e28302ffa2e2afa26caecf55d2be05c17382..ca7a9098db4eb7ddcb72f1e14a81626de2c75811 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3122,5 +3122,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0045-Add-death-screen-API.patch b/patches/api/0044-Add-death-screen-API.patch similarity index 100% rename from patches/api/0045-Add-death-screen-API.patch rename to patches/api/0044-Add-death-screen-API.patch diff --git a/patches/api/0046-Add-item-packet-serialize-event.patch b/patches/api/0045-Add-item-packet-serialize-event.patch similarity index 100% rename from patches/api/0046-Add-item-packet-serialize-event.patch rename to patches/api/0045-Add-item-packet-serialize-event.patch diff --git a/patches/api/0047-Language-API.patch b/patches/api/0046-Language-API.patch similarity index 100% rename from patches/api/0047-Language-API.patch rename to patches/api/0046-Language-API.patch diff --git a/patches/api/0048-Add-log-suppression-for-LibraryLoader.patch b/patches/api/0047-Add-log-suppression-for-LibraryLoader.patch similarity index 100% rename from patches/api/0048-Add-log-suppression-for-LibraryLoader.patch rename to patches/api/0047-Add-log-suppression-for-LibraryLoader.patch diff --git a/patches/api/0049-Fire-Immunity-API.patch b/patches/api/0048-Fire-Immunity-API.patch similarity index 100% rename from patches/api/0049-Fire-Immunity-API.patch rename to patches/api/0048-Fire-Immunity-API.patch diff --git a/patches/api/0050-Added-goat-ram-event.patch b/patches/api/0049-Added-goat-ram-event.patch similarity index 100% rename from patches/api/0050-Added-goat-ram-event.patch rename to patches/api/0049-Added-goat-ram-event.patch diff --git a/patches/api/0051-Add-PreExplodeEvents.patch b/patches/api/0050-Add-PreExplodeEvents.patch similarity index 100% rename from patches/api/0051-Add-PreExplodeEvents.patch rename to patches/api/0050-Add-PreExplodeEvents.patch