mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
f2e328d295
Upstream has released updates that appears to apply and compile correctly Paper Changes: ad708dd3 Add option to allow iron golems to spawn in air (Closes #1965, Closes #1851) b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)
57 lines
2.3 KiB
Diff
57 lines
2.3 KiB
Diff
From 7e4d57b8d6a58f6bd1b60e06798513b4d57d6454 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 19 Oct 2019 00:29:02 -0500
|
|
Subject: [PATCH] Add more evoker API
|
|
|
|
---
|
|
.../java/net/minecraft/server/EntityEvoker.java | 6 ++++--
|
|
.../org/bukkit/craftbukkit/entity/CraftEvoker.java | 13 +++++++++++++
|
|
2 files changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
|
|
index 179a261296..e7d0d0f5e3 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityEvoker.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityEvoker.java
|
|
@@ -102,12 +102,14 @@ 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.bw = entitysheep;
|
|
}
|
|
|
|
- @Nullable
|
|
- private EntitySheep eK() {
|
|
+
|
|
+ @Nullable public EntitySheep getWololoTarget() { return eK(); } // Purpur - OBFHELPER
|
|
+ @Nullable private EntitySheep eK() {
|
|
return this.bw;
|
|
}
|
|
|
|
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.24.0
|
|
|