core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0349-Set-Zombie-last-tick-a...

23 lines
933 B
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit) 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: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-01 22:03:47 +00:00
From 927f97dad5c3c7c78203de3e3fd891a8d85652eb Mon Sep 17 00:00:00 2001
Set Zombie lastTick at start of drowned conversion Fixes GH-1887 Prior to this change, the lastTick value for zombies would be set to their initial spawn tick. This caused the drowned conversion process to immediately occur rather than observing the vanilla delay. Easy fix, just make sure its set again when the process actually starts. And no, this change has absolutely nothing to do with the other thing. That's been fixed and remains fixed.
2019-03-04 07:25:22 +00:00
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
Updated Upstream (Bukkit/CraftBukkit) 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: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-01 22:03:47 +00:00
index 2d4f8aac8f..8635d4f40c 100644
Set Zombie lastTick at start of drowned conversion Fixes GH-1887 Prior to this change, the lastTick value for zombies would be set to their initial spawn tick. This caused the drowned conversion process to immediately occur rather than observing the vanilla delay. Easy fix, just make sure its set again when the process actually starts. And no, this change has absolutely nothing to do with the other thing. That's been fixed and remains fixed.
2019-03-04 07:25:22 +00:00
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
Updated Upstream (Bukkit/CraftBukkit) 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
2019-07-28 14:32:14 +00:00
@@ -169,6 +169,7 @@ public class EntityZombie extends EntityMonster {
Houston, we got a patch (#2731) * Houston, we got a patch * is this the end of the beginning or the beginning of the end
2019-12-12 16:20:43 +00:00
++this.bC;
if (this.bC >= 600) {
Set Zombie lastTick at start of drowned conversion Fixes GH-1887 Prior to this change, the lastTick value for zombies would be set to their initial spawn tick. This caused the drowned conversion process to immediately occur rather than observing the vanilla delay. Easy fix, just make sure its set again when the process actually starts. And no, this change has absolutely nothing to do with the other thing. That's been fixed and remains fixed.
2019-03-04 07:25:22 +00:00
this.startDrownedConversion(300);
+ this.lastTick = MinecraftServer.currentTick; // Paper - Make sure this is set at start of process - GH-1887
}
} else {
Houston, we got a patch (#2731) * Houston, we got a patch * is this the end of the beginning or the beginning of the end
2019-12-12 16:20:43 +00:00
this.bC = -1;
Set Zombie lastTick at start of drowned conversion Fixes GH-1887 Prior to this change, the lastTick value for zombies would be set to their initial spawn tick. This caused the drowned conversion process to immediately occur rather than observing the vanilla delay. Easy fix, just make sure its set again when the process actually starts. And no, this change has absolutely nothing to do with the other thing. That's been fixed and remains fixed.
2019-03-04 07:25:22 +00:00
--
Updated Upstream (Bukkit/CraftBukkit) 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: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-01 22:03:47 +00:00
2.26.2
Set Zombie lastTick at start of drowned conversion Fixes GH-1887 Prior to this change, the lastTick value for zombies would be set to their initial spawn tick. This caused the drowned conversion process to immediately occur rather than observing the vanilla delay. Easy fix, just make sure its set again when the process actually starts. And no, this change has absolutely nothing to do with the other thing. That's been fixed and remains fixed.
2019-03-04 07:25:22 +00:00