2019-06-06 15:36:57 +00:00
|
|
|
From 024da92de8dda77f834fab9e8bbf8a2e616dac90 Mon Sep 17 00:00:00 2001
|
2018-07-04 19:32:30 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 4 Jul 2018 15:30:22 -0400
|
2018-08-11 02:13:00 +00:00
|
|
|
Subject: [PATCH] Vex#getSummoner API
|
2018-07-04 19:32:30 +00:00
|
|
|
|
|
|
|
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
|
2019-06-06 15:36:57 +00:00
|
|
|
index e74f85e6f0..d7bea83890 100644
|
2018-07-04 19:32:30 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
2019-04-30 01:20:24 +00:00
|
|
|
@@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster {
|
2018-07-04 19:32:30 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2018-07-18 23:16:19 +00:00
|
|
|
+ public EntityInsentient getOwner() { return l(); } // Paper - OBFHELPER
|
|
|
|
public EntityInsentient l() {
|
2019-04-30 01:20:24 +00:00
|
|
|
return this.c;
|
2018-07-04 19:32:30 +00:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
2019-06-06 15:36:57 +00:00
|
|
|
index 737a37b6fe..169c951ec3 100644
|
2018-07-04 19:32:30 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
2018-08-11 02:13:00 +00:00
|
|
|
@@ -1,8 +1,10 @@
|
2018-07-04 19:32:30 +00:00
|
|
|
package org.bukkit.craftbukkit.entity;
|
|
|
|
|
|
|
|
+import net.minecraft.server.EntityInsentient;
|
|
|
|
import net.minecraft.server.EntityVex;
|
|
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
|
|
import org.bukkit.entity.EntityType;
|
2018-08-11 02:13:00 +00:00
|
|
|
+import org.bukkit.entity.Mob;
|
|
|
|
import org.bukkit.entity.Vex;
|
|
|
|
|
|
|
|
public class CraftVex extends CraftMonster implements Vex {
|
2018-07-04 19:32:30 +00:00
|
|
|
@@ -16,6 +18,13 @@ public class CraftVex extends CraftMonster implements Vex {
|
|
|
|
return (EntityVex) super.getHandle();
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
2018-08-11 02:13:00 +00:00
|
|
|
+ public Mob getSummoner() {
|
2018-07-04 19:32:30 +00:00
|
|
|
+ EntityInsentient owner = getHandle().getOwner();
|
2018-08-11 02:13:00 +00:00
|
|
|
+ return owner != null ? (Mob) owner.getBukkitEntity() : null;
|
2018-07-04 19:32:30 +00:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public String toString() {
|
|
|
|
return "CraftVex";
|
|
|
|
--
|
2019-03-20 01:46:00 +00:00
|
|
|
2.21.0
|
2018-07-04 19:32:30 +00:00
|
|
|
|