core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0029-Always-tick-falling-bl...

30 lines
1.3 KiB
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 8576f528af0499d34185a87f3f3435d7eceea674 Mon Sep 17 00:00:00 2001
Relocate Timings v2 patch
2016-03-25 04:59:37 +00:00
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 00:32:25 -0600
Subject: [PATCH] Always tick falling blocks
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.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 106e9d7e2d..7341dc2c1c 100644
Relocate Timings v2 patch
2016-03-25 04:59:37 +00:00
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature;
import net.minecraft.server.EntityCreeper;
import net.minecraft.server.EntityEnderCrystal;
import net.minecraft.server.EntityEnderDragon;
+import net.minecraft.server.EntityFallingBlock; // Paper
import net.minecraft.server.EntityFireball;
import net.minecraft.server.EntityFireworks;
import net.minecraft.server.EntityHuman;
Update upstream CB/S --- work/CraftBukkit Submodule work/CraftBukkit ba575a5a..b7fea427: > SPIGOT-5010: World.getEntities returns entities in border chunks > Show incorrect size passed into createInventory --- work/Spigot Submodule work/Spigot 093165d1..01d0f046: > SPIGOT-4986: EntityActivationRange - Raiders > SPIGOT-4988: Setting "mob-spawn-range" in spigot.yml also effects random block ticks
2019-05-30 23:54:25 +00:00
@@ -93,6 +94,7 @@ public class ActivationRange
Relocate Timings v2 patch
2016-03-25 04:59:37 +00:00
|| entity instanceof EntityFireball
A bit more work for 1.14
2019-04-24 02:34:11 +00:00
|| entity instanceof EntityLightning
Relocate Timings v2 patch
2016-03-25 04:59:37 +00:00
|| entity instanceof EntityTNTPrimed
+ || entity instanceof EntityFallingBlock // Paper - Always tick falling blocks
|| entity instanceof EntityEnderCrystal
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 01:53:17 +00:00
|| entity instanceof EntityFireworks
|| entity instanceof EntityThrownTrident )
Relocate Timings v2 patch
2016-03-25 04:59:37 +00:00
--
Initial work on 1.14 pre-5
2019-04-23 04:47:07 +00:00
2.21.0
Relocate Timings v2 patch
2016-03-25 04:59:37 +00:00