mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 01:10:37 +01:00
684bd2adbc
--- work/Bukkit Submodule work/Bukkit 9a793cce8..0c1d258bb: > Make PigZapEvent extend EntityTransformEvent --- work/CraftBukkit Submodule work/CraftBukkit ee6684bba..6a398ac44: > SPIGOT-4511: Trident doesn't lose durability > Tweak outdated windows
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 98f5aff421ed8074a66f272dba2c70656b9d1b7c 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 6e029ff44..1bf705e82 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 927ed9a9a..c23b1e960 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.19.1
|
|
|