93891ad57a
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: 3d9d2efc SPIGOT-5202: WorldCreator#copy does not copy all options CraftBukkit Changes: 3e7b3862 SPIGOT-5195 (#2): Player loot table does not drop when keepInventory is on c88867e4 SPIGOT-5208: Reset state on cancelled EntityTransformEvent to prevent event spam f744c09c SPIGOT-5214: setCooldown not working 860b3540 SPIGOT-5204: Typo in deprecated enchantment name
22 lines
931 B
Diff
22 lines
931 B
Diff
From 8dbeb44fd71b383d5ce9432eb6cc52ebccecfe1e Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach@zachbr.io>
|
|
Date: Mon, 4 Mar 2019 02:23:28 -0500
|
|
Subject: [PATCH] Set Zombie last tick at start of drowning process
|
|
|
|
Fixes GH-1887
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
|
|
index cdaa7f636..99b2e7815 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
|
@@ -169,6 +169,7 @@ public class EntityZombie extends EntityMonster {
|
|
++this.bF;
|
|
if (this.bF >= 600) {
|
|
this.startDrownedConversion(300);
|
|
+ this.lastTick = MinecraftServer.currentTick; // Paper - Make sure this is set at start of process - GH-1887
|
|
}
|
|
} else {
|
|
this.bF = -1;
|
|
--
|
|
2.22.0
|
|
|