ea855e2b46
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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
23 lines
931 B
Diff
23 lines
931 B
Diff
From 727fe100a19532c038f152a5dd279eb293a62e2a 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 24bc3e0f0..bf2bed002 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
|
@@ -175,6 +175,7 @@ public class EntityZombie extends EntityMonster {
|
|
++this.bI;
|
|
if (this.bI >= 600) {
|
|
this.startDrownedConversion(300);
|
|
+ this.lastTick = MinecraftServer.currentTick; // Paper - Make sure this is set at start of process - GH-1887
|
|
}
|
|
} else {
|
|
this.bI = -1;
|
|
--
|
|
2.21.0
|
|
|