From d1b09605870a98731d5ea3f2cf15f20c60969243 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:30:22 -0400 Subject: [PATCH] Vex#getOwner API Get's the NPC that summoned this Vex diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java index 897d7c681..ba1109e03 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -86,6 +86,7 @@ public class EntityVex extends EntityMonster { } + public EntityInsentient getOwner() { return l(); } // Paper - OBFHELPER public EntityInsentient l() { return this.b; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java index 787a41e01..5d5658136 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -1,5 +1,7 @@ package org.bukkit.craftbukkit.entity; +import com.destroystokyo.paper.entity.SentientNPC; +import net.minecraft.server.EntityInsentient; import net.minecraft.server.EntityVex; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.EntityType; @@ -16,6 +18,13 @@ public class CraftVex extends CraftMonster implements Vex { return (EntityVex) super.getHandle(); } + // Paper start + public SentientNPC getOwner() { + EntityInsentient owner = getHandle().getOwner(); + return owner != null ? (SentientNPC) owner.getBukkitEntity() : null; + } + // Paper end + @Override public String toString() { return "CraftVex"; -- 2.18.0