Cleanup some patches (#9093)

patches/api/0171-Entity-getEntitySpawnReason.patch

@@ -9,8 +9,10 @@ Pre existing entities will return NATURAL if it was a non
 persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
+Co-authored-by: Aurora <aurora@relanet.eu>
+
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6fb14175962ec9730e4b70330481ec21d2c87da5..84e201c1695e9a97354f84156d82c47f9b722281 100644
+index cd489dddec0b1ab50947a523c467ce3825961549..b541674b1d7061be9e8e7545a5050c7ee0ca4c66 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -780,5 +780,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -19,7 +21,7 @@ index 6fb14175962ec9730e4b70330481ec21d2c87da5..84e201c1695e9a97354f84156d82c47f
      }
 +
 +    /**
-+     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that spawned this entity.
++     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that initially spawned this entity. <!-- Paper - added "initially" to clarify that the SpawnReason doesn't change after the Entity was initially spawned" -->
 +     */
 +    @NotNull
 +    org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();

patches/api/0217-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aurora <aurora@relanet.eu>
-Date: Sat, 3 Oct 2020 16:28:41 +0200
-Subject: [PATCH] Clarify the Javadocs for Entity.getEntitySpawnReason()
-
-
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 2c7c53b96b92ea9ef4e185558d744d0955a5e9e7..81d9f085905283e54c3bd597e15ac1bf693f541f 100644
---- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -782,7 +782,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-     }
- 
-     /**
--     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that spawned this entity.
-+     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that initially spawned this entity. <!-- Paper - added "initially" to clarify that the SpawnReason doesn't change after the Entity was initially spawned" -->
-      */
-     @NotNull
-     org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();

patches/api/0218-Player-elytra-boost-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 40191fb054e90724e5f28b4078d41073c7bc5dc5..f6bbd49e655c5f89d77f36ca21952679ab31b6bb 100644
+index edd90e8311c47e9bbd6e962395503c445455bc23..2a3eed2795d26dc104a143ede85428f15a7f839d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2579,6 +2579,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0223-Add-API-for-quit-reason.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
-index 0395ca85a466f6356259078d3bad48b2ce6e57b7..6e9205024ca9d3000a371bd0eb723dcd6c662bce 100644
+index 14b27eaaf744736b3e56bb1383481df98a218c43..84703b5d174625b1a4a995a244e6400d2675fbb5 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
 @@ -11,16 +11,28 @@ import org.jetbrains.annotations.Nullable;

patches/api/0245-Add-sendOpLevel-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f6bbd49e655c5f89d77f36ca21952679ab31b6bb..6c4d148202c3378e361fd8068c00cc0b67d6dc1e 100644
+index 2a3eed2795d26dc104a143ede85428f15a7f839d..77fb32968d9d32096d93a760a8b08ded310d31b5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2592,6 +2592,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0260-Expose-Tracked-Players.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 81d9f085905283e54c3bd597e15ac1bf693f541f..e0265937a5daf968a9a3f453f4aabf37f76d2c1c 100644
+index e212fcb53c9d2f8aad3e1582b64de1743f2efbfc..368a308e5420f9a9ed403358e7224d2df67a89bb 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -826,5 +826,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

patches/api/0267-Item-Rarity-API.patch

@@ -88,7 +88,7 @@ index 6c45841538f2f073691331f975741a62b03a6637..e87cbaf9c1ea1330ab1597f98c8864d0
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 03a15727c85a08c0c79965be249373a11f31ce6e..c6378a880eac9f444c66f640260e8d410efd015b 100644
+index e4ad3a550050c4bf9cc7a2a1082bfdf668050efe..4f867ba2bc9b1a7c277e4a5f0ea8b452315f3272 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -877,5 +877,15 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

patches/api/0271-add-get-set-drop-chance-to-EntityEquipment.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] add get-set drop chance to EntityEquipment
 
 
 diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-index 42f76751ec414648ee719c341d471d947bf85be6..58d52f6e1660ebdb098566a2ae6b50c8b44dc0d9 100644
+index 62c1c3f01fd58db39f635eee415fcbc19fb36ec9..fddffa6f415048c4a1eda049178c6d34d8519337 100644
 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
 +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
 @@ -513,4 +513,32 @@ public interface EntityEquipment {

patches/api/0286-ItemStack-repair-check-API.patch

@@ -26,7 +26,7 @@ index 906f313d8c91e65ce934143208ed281ce02f5354..29a91ec8e97ce66383a1dd1fc3dcbcdc
       * Returns the server's protocol version.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index c6378a880eac9f444c66f640260e8d410efd015b..b731ac4f6cd82d8476e4040a2204f58b0f63a0d3 100644
+index 4f867ba2bc9b1a7c277e4a5f0ea8b452315f3272..2d945516ec65ffe103479aea218b3002cc572dc1 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -887,5 +887,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

patches/api/0289-ItemStack-editMeta.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack#editMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ffde4d11d4d5e783afb77bc2e96cf71113b2eb25..c5579710f73e9b8d407d5b8d698d2543a25a752d 100644
+index 2d945516ec65ffe103479aea218b3002cc572dc1..f9faef1b73b5027a3d22e76a0b33b7c952f3ae08 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -547,6 +547,50 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

patches/api/0294-Add-PlayerKickEvent-causes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b49620af0edcf10e7f74d616dcb4fb775308308f..bf5eeaffb7983c6a849ee80df0b78230d3cce42b 100644
+index 77fb32968d9d32096d93a760a8b08ded310d31b5..11c5cfa3e35395c2967dc1e0864e0b953fda30c6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -249,6 +249,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0298-Add-more-line-of-sight-methods.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add more line of sight methods
 
 
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa..43b53c21af01e0f496c8aaacff82dfdfadaf40f6 100644
+index f30fff08bf04c4d274b2ce242a135a14924f1cb0..3c38abfbe0391bf748702b1599d359a1180838af 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
 @@ -392,5 +392,13 @@ public interface RegionAccessor extends Keyed { // Paper
@@ -23,7 +23,7 @@ index aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa..43b53c21af01e0f496c8aaacff82dfdf
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 16536dae04b020de43f9e13ff32c659b9e6cab0c..72f7bf02ec1ace2c835e4ad58e3e59b3d7357972 100644
+index 6a4c54ea92478be6e53b62ebe4e73068b9ed4a29..626eb1796d5a19d110855e2fb95cb4c761ecc544 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -546,6 +546,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

patches/api/0305-Stinger-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 72f7bf02ec1ace2c835e4ad58e3e59b3d7357972..4febec3623b936cf40daba6196392ebce4b8d5a8 100644
+index 626eb1796d5a19d110855e2fb95cb4c761ecc544..08167783b6e4e7d393779c92500793518ee346a6 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -399,6 +399,36 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

patches/api/0314-More-CommandBlock-API.patch

@@ -69,7 +69,7 @@ index 0000000000000000000000000000000000000000..09e57f495e3cbf3c6f434d12ab348308
 +    void setSuccessCount(int successCount);
 +}
 diff --git a/src/main/java/org/bukkit/block/CommandBlock.java b/src/main/java/org/bukkit/block/CommandBlock.java
-index 73dce588d1f7a5048300073bf8c2b14d6da1e857..d63da691fb8cfa04bb699adb2eb55278e8b76200 100644
+index 9c88be68b4f403d0500cb607394b3a1646675ef7..02bf0f8c12052dd5c17422153228083f56bea75b 100644
 --- a/src/main/java/org/bukkit/block/CommandBlock.java
 +++ b/src/main/java/org/bukkit/block/CommandBlock.java
 @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable;