49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
|
From 5a08e37a76a354a044fa503b8f4f4c0d4f9be59a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
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 a0abaf431..673c3ff3c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
||
|
|
@@ -90,6 +90,7 @@ public class EntityVex extends EntityMonster {
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public EntityInsentient getOwner() { return p(); } // Paper - OBFHELPER
|
||
|
|
public EntityInsentient p() {
|
||
|
|
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
|
||
|
|
|