mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
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:d3ed1516Fix dangerously threaded beacons217a293dDon't relocate joptsimple to allow --help to work.1be05a21Prepare for imminent Java 12 releasea49270b2Mappings Update5259d80cSPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From ad4eebb90434f0752dcbecb8a163e6bfe6ba87dd Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 6 Oct 2018 21:47:44 -0500
|
|
Subject: [PATCH] Allow setting the vex's summoner
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
|
|
index c3864b869..589b13f4e 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
|
@@ -127,6 +127,7 @@ public class EntityVex extends EntityMonster {
|
|
this.a(1, flag);
|
|
}
|
|
|
|
+ public void setOwner(EntityInsentient entityinsentient) { a(entityinsentient); } // Paper - OBFHELPER
|
|
public void a(EntityInsentient entityinsentient) {
|
|
this.b = entityinsentient;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
index c96a5df80..b09da64c3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
|
@@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
|
|
EntityInsentient owner = getHandle().getOwner();
|
|
return owner != null ? (Mob) owner.getBukkitEntity() : null;
|
|
}
|
|
+
|
|
+ public void setSummoner(Mob summoner) {
|
|
+ getHandle().setOwner(summoner == null ? null : ((CraftMob) summoner).getHandle());
|
|
+ }
|
|
// Paper end
|
|
|
|
@Override
|
|
--
|
|
2.21.0
|
|
|