diff options
author | Lulu13022002 <[email protected]> | 2024-06-23 22:08:13 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2024-06-23 22:08:13 +0200 |
commit | 95aa440473bcdc75cfb8c2059163d0896ab179bb (patch) | |
tree | c41878065ef7a18af5f2389cb0ac7cd1a5777d4c /patches/api | |
parent | 19eefe93210a959d89af09108be3eb10830af672 (diff) | |
download | Paper-95aa440473bcdc75cfb8c2059163d0896ab179bb.tar.gz Paper-95aa440473bcdc75cfb8c2059163d0896ab179bb.zip |
Add missing effect cause and deprecate PATROL_CAPTAIN cause (#10958)
Diffstat (limited to 'patches/api')
-rw-r--r-- | patches/api/0166-Fix-Spigot-annotation-mistakes.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch index 2292c8df84..05a3f639e4 100644 --- a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch @@ -1003,6 +1003,21 @@ index f2edd4a9357832e9dec3fb0aafa006335d7b289b..f05ce4fd6c4bbd79edc5f65e7edd1e4a return offers; } +diff --git a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java +index c9f395064656dd0126410eb3c6e197baa450c063..c95943a0c6a2cc7685b0e2601460d92fa1b4b2f5 100644 +--- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java ++++ b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java +@@ -219,7 +219,10 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable + MILK, + /** + * When a player gets bad omen after killing a patrol captain. ++ * ++ * @deprecated no longer used, player now gets an ominous bottle instead + */ ++ @Deprecated(since = "1.21") // Paper + PATROL_CAPTAIN, + /** + * When a potion effect is modified through the plugin methods. diff --git a/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java index 090ec6f96ca9b7f760389994da988c44c32b9976..e6b4d4c1722bf4a11744a421d09646b22745b138 100644 --- a/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java |