be13705177
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 6b8cd9a7 SPIGOT-6207: forcibly drop the items of a converted zombie villager
45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 18 Nov 2020 11:32:46 -0800
|
|
Subject: [PATCH] Zombie API - breaking doors
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java b/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
|
|
index 87acbdee03edf8bc35f4b3bcb9b82855ed4a3c33..5b0c79d752d616e5824393968136f3844ce52c22 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityZombie.java
|
|
@@ -140,10 +140,12 @@ public class EntityZombie extends EntityMonster {
|
|
return (Boolean) this.getDataWatcher().get(EntityZombie.DROWN_CONVERTING);
|
|
}
|
|
|
|
+ public boolean canBreakDoors() { return this.eU(); } // Paper - OBFHELPER
|
|
public boolean eU() {
|
|
return this.bs;
|
|
}
|
|
|
|
+ public void setCanBreakDoors(boolean canBreakDoors) { this.u(canBreakDoors); } // Paper - OBFHELPER
|
|
public void u(boolean flag) {
|
|
if (this.eK() && PathfinderGoalUtil.a(this)) {
|
|
if (this.bs != flag) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
|
|
index 42d98d798bb8fe2d3c7cc2bfcf2ec38d97d99bd2..e1589ef97222f5e29a3628db354d4406a443a613 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
|
|
@@ -129,6 +129,16 @@ public class CraftZombie extends CraftMonster implements Zombie {
|
|
public void setShouldBurnInDay(boolean shouldBurnInDay) {
|
|
getHandle().setShouldBurnInDay(shouldBurnInDay);
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public boolean canBreakDoors() {
|
|
+ return getHandle().canBreakDoors();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCanBreakDoors(boolean canBreakDoors) {
|
|
+ getHandle().setCanBreakDoors(canBreakDoors);
|
|
+ }
|
|
// Paper end
|
|
|
|
@Override
|