899bc53b79
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: f47abd88 SPIGOT-6242: Fix some file line endings de96535b SPIGOT-6234: enum classes don't serialize properly when implementing ConfigurationSerializable CraftBukkit Changes: 4475707d SPIGOT-6244: /spawnpoint ignores angle 8b3b096d SPIGOT-6242: Fix some file line endings 4b33c749 SPIGOT-6186: Canceling a CreatureSpawnEvent results in a "Unable to summon entity due to duplicate UUIDs" error 2b3ca726 SPIGOT-6236: Vehicle passenger portal cooldown does not change
34 Zeilen
1.6 KiB
Diff
34 Zeilen
1.6 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/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
|
|
index b84eb0394ab9a53e32b774682bc42b067625195e..ed6a47ad2fd973695fbb151d1a44000ec3639e54 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
|
@@ -130,6 +130,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 169c951ec30fc5b78eb4ba29352ba009b7fa5efd..2f7df3074f8fd66fe2ea1cced08db910078e1848 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
|