e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
52 Zeilen
1.7 KiB
Diff
52 Zeilen
1.7 KiB
Diff
From 109c542b07b8b39e1a589823069f4ce128be11ec 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 cd9fb3aabf..a46730460e 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
|
@@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster {
|
|
|
|
}
|
|
|
|
+ public EntityInsentient getOwner() { return l(); } // Paper - OBFHELPER
|
|
public EntityInsentient l() {
|
|
return this.c;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
index 737a37b6fe..169c951ec3 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.25.1
|
|
|