Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.15

Browse Source
This commit is contained in:
William Blake Galbreath
2019-12-13 15:11:37 -06:00
parent af7f8f2bb5
commit 18ebfc0366
88 changed files with 1038 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
patches/server/0069-Add-more-evoker-API.patch
View File

@@ -1,55 +0,0 @@
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