mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 19:56:52 +01:00
e4d10a6d67
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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58e
SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579f
Add FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238
SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3
SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
23 lines
933 B
Diff
23 lines
933 B
Diff
From acb56c4cf6eb06a4145906fea74407247e7b4843 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 2d4f8aac8f..8635d4f40c 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.bC;
|
|
if (this.bC >= 600) {
|
|
this.startDrownedConversion(300);
|
|
+ this.lastTick = MinecraftServer.currentTick; // Paper - Make sure this is set at start of process - GH-1887
|
|
}
|
|
} else {
|
|
this.bC = -1;
|
|
--
|
|
2.25.1
|
|
|