mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 15:04:06 +01:00
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/world/entity/monster/EntityVex.java b/src/main/java/net/minecraft/world/entity/monster/EntityVex.java
|
||
|
|
index 3b74ade60b3b0ae0e908866cb4ac11acd75620ff..9645d052069957311478a1ceca42ad52f7a9aa0b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EntityVex.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityVex.java
|
||
|
|
@@ -165,6 +165,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.c = entityinsentient;
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||
|
|
index 962d6017f6acc47ebe4b754ccd9b97a1fc97cc58..30e2c169388b09b94d801be7543e75ea0bd56fcd 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
|
||
|
|
@@ -21,6 +21,10 @@ public class CraftVex extends CraftMonster implements Vex {
|
||
|
|
net.minecraft.world.entity.EntityInsentient owner = getHandle().getOwner();
|
||
|
|
return owner != null ? (org.bukkit.entity.Mob) owner.getBukkitEntity() : null;
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public void setSummoner(org.bukkit.entity.Mob summoner) {
|
||
|
|
+ getHandle().setOwner(summoner == null ? null : ((CraftMob) summoner).getHandle());
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
@Override
|