From d8a6cbf7b46cbd7f6c3c98015f8d29f7d1734a30 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:31:00 -0500 Subject: [PATCH] Add more evoker API --- patches/api/0020-Add-more-evoker-API.patch | 38 +++++++++++++ patches/server/0072-Add-more-evoker-API.patch | 55 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 patches/api/0020-Add-more-evoker-API.patch create mode 100644 patches/server/0072-Add-more-evoker-API.patch diff --git a/patches/api/0020-Add-more-evoker-API.patch b/patches/api/0020-Add-more-evoker-API.patch new file mode 100644 index 000000000..c9aebd604 --- /dev/null +++ b/patches/api/0020-Add-more-evoker-API.patch @@ -0,0 +1,38 @@ +From 91221b140ec7bfc4bf992c7759d84590957c5ea4 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sat, 19 Oct 2019 00:28:53 -0500 +Subject: [PATCH] Add more evoker API + +--- + src/main/java/org/bukkit/entity/Evoker.java | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/src/main/java/org/bukkit/entity/Evoker.java b/src/main/java/org/bukkit/entity/Evoker.java +index f8d173adc..f2a03f7f8 100644 +--- a/src/main/java/org/bukkit/entity/Evoker.java ++++ b/src/main/java/org/bukkit/entity/Evoker.java +@@ -64,4 +64,21 @@ public interface Evoker extends Spellcaster { + */ + @Deprecated + void setCurrentSpell(@Nullable Spell spell); ++ ++ // Purpur start ++ /** ++ * Get the sheep being targeted by the Wololo spell ++ * ++ * @return Targeted sheep ++ */ ++ @Nullable ++ Sheep getWololoTarget(); ++ ++ /** ++ * Set the sheep targeted by the Wololo spell ++ * ++ * @param sheep Sheep to target ++ */ ++ void setWololoTarget(@Nullable Sheep sheep); ++ // Purpur end + } +-- +2.23.0.rc1 + diff --git a/patches/server/0072-Add-more-evoker-API.patch b/patches/server/0072-Add-more-evoker-API.patch new file mode 100644 index 000000000..ecd880e3b --- /dev/null +++ b/patches/server/0072-Add-more-evoker-API.patch @@ -0,0 +1,55 @@ +From 3812a31f019067f240b21deb0927bc1d040335bb Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sat, 19 Oct 2019 00:29:02 -0500 +Subject: [PATCH] Add more evoker API + +--- + .../java/net/minecraft/server/EntityEvoker.java | 5 +++-- + .../org/bukkit/craftbukkit/entity/CraftEvoker.java | 13 +++++++++++++ + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java +index 8d923a34c3..b22f071990 100644 +--- a/src/main/java/net/minecraft/server/EntityEvoker.java ++++ b/src/main/java/net/minecraft/server/EntityEvoker.java +@@ -90,12 +90,13 @@ public class EntityEvoker extends EntityIllagerWizard { + return SoundEffects.ENTITY_EVOKER_HURT; + } + ++ public void setWololoTarget(@Nullable EntitySheep sheep) { a(sheep); } // Purpur - OBFHELPER + private void a(@Nullable EntitySheep entitysheep) { + this.bz = entitysheep; + } + +- @Nullable +- private EntitySheep ep() { ++ @Nullable public EntitySheep getWololoTarget() { return ep(); } // Purpur - OBFHELPER ++ @Nullable private EntitySheep ep() { + return this.bz; + } + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java +index 0636d26473..4ccb938909 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java +@@ -36,4 +36,17 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker { + public void setCurrentSpell(Evoker.Spell spell) { + getHandle().setSpell(spell == null ? EntityIllagerWizard.Spell.NONE : EntityIllagerWizard.Spell.a(spell.ordinal())); + } ++ ++ // Purpur start ++ @javax.annotation.Nullable ++ public org.bukkit.entity.Sheep getWololoTarget() { ++ net.minecraft.server.EntitySheep target = getHandle().getWololoTarget(); ++ return target == null ? null : (org.bukkit.entity.Sheep) target.getBukkitEntity(); ++ } ++ ++ @Override ++ public void setWololoTarget(@javax.annotation.Nullable org.bukkit.entity.Sheep sheep) { ++ getHandle().setWololoTarget(sheep == null ? null : (net.minecraft.server.EntitySheep) ((CraftEntity) sheep).getHandle()); ++ } ++ // Purpur end + } +-- +2.23.0.rc1 +