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

23 lines
933 B
Diff
Raw Normal View History

Update upstream & fix some chunk related issues (#2177) * 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
2019-06-14 02:27:40 +00:00
From d6d91a4483518bad152a8d18ab5a36f14e3f83d0 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 (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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
2019-06-06 15:36:57 +00:00
index b20fe8e521..40a796384c 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
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
@@ -167,6 +167,7 @@ public class EntityZombie extends EntityMonster {
++this.bF;
if (this.bF >= 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 {
More 1.14 patches now we can rebase
2019-05-05 17:19:34 +00:00
this.bF = -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/Spigot) 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 Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 00:28:15 +00:00
2.21.0
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