diff options
| author | Nassim Jahnke <[email protected]> | 2024-07-17 22:26:49 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-07-17 23:16:35 +0200 |
| commit | 15cb355ea3b9c4c0bea8fb09684dac15b4b0356b (patch) | |
| tree | 12a10af95604c2312c9d04250857974f6d31d794 /patches/api/0287-Missing-Entity-API.patch | |
| parent | 44c3dd0d4c83cbfb8b41270c8d4ef0d1571e3925 (diff) | |
| download | Paper-15cb355ea3b9c4c0bea8fb09684dac15b4b0356b.tar.gz Paper-15cb355ea3b9c4c0bea8fb09684dac15b4b0356b.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot)upstream
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
3a3bea52 SPIGOT-7829: Increase maximum outgoing plugin message size to match Vanilla intention
5cd1c8cb SPIGOT-7831: Add CreatureSpawnEvent.SpawnReason#POTION_EFFECT
a8e278f0 SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-players can now create portals
53729d12 Remove spurious ApiStatus.Internal annotation
b9f57486 SPIGOT-7799, PR-1039: Expose explosion world interaction in EntityExplodeEvent and BlockExplodeEvent
7983b966 PR-1029: Trial changing a small number of inner enums to classes/interfaces to better support custom values
CraftBukkit Changes:
403accd56 SPIGOT-7831: Add CreatureSpawnEvent.SpawnReason#POTION_EFFECT
812761660 Increase outdated build delay
bed1e3ff6 SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-players can now create portals
2444c8b23 SPIGOT-7823: Suspicious sand and gravel material are not marked as having gravity correctly
aceddcd0b SPIGOT-7820: Enum changes - duplicate method name
a0d2d6a84 SPIGOT-7813: Material#isInteractable() always returns false
8fd64b091 SPIGOT-7806: Handle both loot and inventory item drop behaviour in PlayerDeathEvent
a4ee40b74 SPIGOT-7799, PR-1436: Expose explosion world interaction in EntityExplodeEvent and BlockExplodeEvent
082aa51c5 PR-1424: Trial changing a small number of inner enums to classes/interfaces to better support custom values
66e78a96b SPIGOT-7815: Consider EntityDamageEvent status for Wolf armor damage
Spigot Changes:
5bbef5ad SPIGOT-7834: Modify max value for generic.max_absorption
Diffstat (limited to 'patches/api/0287-Missing-Entity-API.patch')
| -rw-r--r-- | patches/api/0287-Missing-Entity-API.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/api/0287-Missing-Entity-API.patch b/patches/api/0287-Missing-Entity-API.patch index 806c30e4a0..a6478a10f4 100644 --- a/patches/api/0287-Missing-Entity-API.patch +++ b/patches/api/0287-Missing-Entity-API.patch @@ -258,11 +258,11 @@ index adb20a9abba33c32d553f620fa82b27dff64ab5f..1f6702b0de00b87dbed7f6d93e911655 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Cat.java b/src/main/java/org/bukkit/entity/Cat.java -index d1327761a4b95eba97877f1991fc19b298b48eaf..0534fbc228f64cf3b361ab097d9b88212bdb0f36 100644 +index 117e3e8c63e56247213b2a9cf9908915d4c65665..70cc76f0c1f4ba23bfa78591e8144bbf8d3f0868 100644 --- a/src/main/java/org/bukkit/entity/Cat.java +++ b/src/main/java/org/bukkit/entity/Cat.java -@@ -68,4 +68,36 @@ public interface Cat extends Tameable, Sittable { - return key; +@@ -94,4 +94,36 @@ public interface Cat extends Tameable, Sittable { + return Lists.newArrayList(Registry.CAT_VARIANT).toArray(new Type[0]); } } + |