Skip to content

Commit 641dafd

Browse files
authored
Cleanup some patches (#9093)
1 parent 0849144 commit 641dafd

File tree

203 files changed

+70
-84
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+70
-84
lines changed

patches/api/0171-Entity-getEntitySpawnReason.patch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ Pre existing entities will return NATURAL if it was a non
99
persistenting Living Entity, SPAWNER for spawners,
1010
or DEFAULT since data was not stored.
1111

12+
Co-authored-by: Aurora <aurora@relanet.eu>
13+
1214
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
13-
index 6fb14175962ec9730e4b70330481ec21d2c87da5..84e201c1695e9a97354f84156d82c47f9b722281 100644
15+
index cd489dddec0b1ab50947a523c467ce3825961549..b541674b1d7061be9e8e7545a5050c7ee0ca4c66 100644
1416
--- a/src/main/java/org/bukkit/entity/Entity.java
1517
+++ b/src/main/java/org/bukkit/entity/Entity.java
1618
@@ -780,5 +780,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -19,7 +21,7 @@ index 6fb14175962ec9730e4b70330481ec21d2c87da5..84e201c1695e9a97354f84156d82c47f
1921
}
2022
+
2123
+ /**
22-
+ * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that spawned this entity.
24+
+ * @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" -->
2325
+ */
2426
+ @NotNull
2527
+ org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();

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

Lines changed: 0 additions & 19 deletions
This file was deleted.
File renamed without changes.

patches/api/0219-Player-elytra-boost-API.patch renamed to patches/api/0218-Player-elytra-boost-API.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 40191fb054e90724e5f28b4078d41073c7bc5dc5..f6bbd49e655c5f89d77f36ca21952679ab31b6bb 100644
8+
index edd90e8311c47e9bbd6e962395503c445455bc23..2a3eed2795d26dc104a143ede85428f15a7f839d 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
1111
@@ -2579,6 +2579,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0220-Add-getOfflinePlayerIfCached-String.patch renamed to patches/api/0219-Add-getOfflinePlayerIfCached-String.patch

File renamed without changes.
File renamed without changes.
File renamed without changes.

patches/api/0223-Beacon-API-custom-effect-ranges.patch renamed to patches/api/0222-Beacon-API-custom-effect-ranges.patch

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
55

66

77
diff --git a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
8-
index 0395ca85a466f6356259078d3bad48b2ce6e57b7..6e9205024ca9d3000a371bd0eb723dcd6c662bce 100644
8+
index 14b27eaaf744736b3e56bb1383481df98a218c43..84703b5d174625b1a4a995a244e6400d2675fbb5 100644
99
--- a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
1010
+++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
1111
@@ -11,16 +11,28 @@ import org.jetbrains.annotations.Nullable;
File renamed without changes.

0 commit comments

Comments
 (0)