38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Wed, 4 Jul 2018 15:30:22 -0400
|
||
|
|
Subject: [PATCH] Vex#getSummoner API
|
||
|
|
|
||
|
|
Get's the NPC that summoned this Vex
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityVex.java b/src/main/java/net/minecraft/world/entity/monster/EntityVex.java
|
||
|
|
index 3acf36a500424808cd91dc607df1ffbe23720c16..3b74ade60b3b0ae0e908866cb4ac11acd75620ff 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EntityVex.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityVex.java
|
||
|
|
@@ -124,6 +124,7 @@ public class EntityVex extends EntityMonster {
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public EntityInsentient getOwner() { return eK(); } // Paper - OBFHELPER
|
||
|
|
public EntityInsentient eK() {
|
||
|
|
return this.c;
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||
|
|
index ccaccffbf5eb18108760d1da09c4c1b2f33ebc42..962d6017f6acc47ebe4b754ccd9b97a1fc97cc58 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||
|
|
@@ -16,6 +16,13 @@ public class CraftVex extends CraftMonster implements Vex {
|
||
|
|
return (EntityVex) super.getHandle();
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ public org.bukkit.entity.Mob getSummoner() {
|
||
|
|
+ net.minecraft.world.entity.EntityInsentient owner = getHandle().getOwner();
|
||
|
|
+ return owner != null ? (org.bukkit.entity.Mob) owner.getBukkitEntity() : null;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
@Override
|
||
|
|
public String toString() {
|
||
|
|
return "CraftVex";
|