Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
57dd397155
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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
37 Zeilen
1.4 KiB
Diff
37 Zeilen
1.4 KiB
Diff
From a913394f33682be1c271f6f27d3adc87a3ac6ee6 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 a46730460e..cf274666c7 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVex.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVex.java
|
|
@@ -133,6 +133,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 169c951ec3..2f7df3074f 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.26.2
|
|
|