ea855e2b46
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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From a89b899dbc110d276fc9e4e1e805f85e8a08db47 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 388d34126..c3864b869 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 0f01fc591..c96a5df80 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.21.0
|
|
|