From 83aee0f5513c91a8d5139b55fe3951d1d5ba6aa4 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 5 Dec 2021 13:16:55 -0800 Subject: [PATCH] [ci skip] Clarify setSize consequences for Slimes (#7036) --- patches/api/0054-Fix-upstream-javadocs.patch | 21 +++++++++++++++++++ .../api/0141-Slime-Pathfinder-Events.patch | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/patches/api/0054-Fix-upstream-javadocs.patch b/patches/api/0054-Fix-upstream-javadocs.patch index f5c38bee2..dd4b514de 100644 --- a/patches/api/0054-Fix-upstream-javadocs.patch +++ b/patches/api/0054-Fix-upstream-javadocs.patch @@ -88,6 +88,27 @@ index c89bfe671ec4110951595b5c8c9e91897bcf8e61..48b127cafe6fecb1849b176df43cbf26 * @param message The message to send * @deprecated use {@link #sendActionBar(Component)} */ +diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java +index 1119e26e270bb45f517955b19d95a9ec3d113634..4631647c64c89ffdde2d9b63bdab974acfe6cb3d 100644 +--- a/src/main/java/org/bukkit/entity/Slime.java ++++ b/src/main/java/org/bukkit/entity/Slime.java +@@ -11,6 +11,16 @@ public interface Slime extends Mob { + public int getSize(); + + /** ++ * Setting the size of the slime (regardless of previous size) ++ * will set the following attributes: ++ * ++ * to their per-size defaults and heal the ++ * slime to its max health (assuming it's alive). ++ * + * @param sz The new size of the slime. + */ + public void setSize(int sz); diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java index 1b2267f4e8ebded198773ec80e2bff2c861c7084..1a58734d919fae247eeb85dd785fd59990856505 100644 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java diff --git a/patches/api/0141-Slime-Pathfinder-Events.patch b/patches/api/0141-Slime-Pathfinder-Events.patch index 8d27bd1b1..953bdc27e 100644 --- a/patches/api/0141-Slime-Pathfinder-Events.patch +++ b/patches/api/0141-Slime-Pathfinder-Events.patch @@ -191,10 +191,10 @@ index 0000000000000000000000000000000000000000..4683a7237d2ed527fc85b9b4e5b2eaaf + } +} diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java -index 1119e26e270bb45f517955b19d95a9ec3d113634..c4791f95d788d3a9e013dc89d8e64103ad8480a1 100644 +index 4631647c64c89ffdde2d9b63bdab974acfe6cb3d..1308dc4ab5779a5cfd9a4e22c43501fc9ceaa7af 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java -@@ -14,4 +14,20 @@ public interface Slime extends Mob { +@@ -24,4 +24,20 @@ public interface Slime extends Mob { * @param sz The new size of the slime. */ public void setSize(int sz);