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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
8d036cea Expose the internal current tick
0c715390 [PATCH] bounding box check for hanging entities (#2664)
527073aa Update config version
0d3b35c3 Rename baby zombie movement config option
This commit is contained in:
William Blake Galbreath
2019-10-31 13:51:33 -05:00
parent da1de4da09
commit dd928e3864
42 changed files with 114 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
patches/server/0071-Add-more-evoker-API.patch Normal file
View File

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