mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
84e7469798
Upstream has released updates that appears to apply and compile correctly Paper Changes: 4a97a7ca Add option to disable pillager patrols (#2626) 23e53aab Backport MC-160177 fix from 1.15 (#2702) 45089d59 Update upstream CB 761c24fa Fix stuck in sneak when changing worlds (MC-10657) (#2627)
56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
From c5762ebef35be6a13d450004f93e3c7984f81a17 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 | 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.24.0.rc1
|
|
|