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