8ed2992da9
Portion of diff was dropped in the mappings update commit. Also remove the option to remove invalid statistics. The server will automatically do this now as of... 1.13?, our option wasn't even doing anything.
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From cdf23d76a567bbe5173d53ed24d192ca4471198d 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/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
|
|
index b83826b18..90028c802 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..927ed9a9a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
@@ -1,8 +1,10 @@
|
|
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;
|
|
+import org.bukkit.entity.Mob;
|
|
import org.bukkit.entity.Vex;
|
|
|
|
public class CraftVex extends CraftMonster implements Vex {
|
|
@@ -16,6 +18,13 @@ public class CraftVex extends CraftMonster implements Vex {
|
|
return (EntityVex) super.getHandle();
|
|
}
|
|
|
|
+ // Paper start
|
|
+ public Mob getSummoner() {
|
|
+ EntityInsentient owner = getHandle().getOwner();
|
|
+ return owner != null ? (Mob) owner.getBukkitEntity() : null;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public String toString() {
|
|
return "CraftVex";
|
|
--
|
|
2.20.0
|
|
|