core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/removed/1.15/0129-Optimize-World.isLoade...

26 lines
1.0 KiB
Diff
Raw Normal View History

Updated Upstream (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 CraftBukkit Changes: eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance 989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving 2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
2019-07-16 22:09:32 +00:00
From afe90ec5ec5202911c92ff2b497d734b76057256 Mon Sep 17 00:00:00 2001
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
From: Aikar <aikar@aikar.co>
Date: Fri, 2 Dec 2016 00:11:43 -0500
Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
Reduce method invocations for World.isLoaded(BlockPosition)Z
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
Updated Upstream (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 CraftBukkit Changes: eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance 989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving 2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
2019-07-16 22:09:32 +00:00
index 4ce18f85b..cfdb6b57f 100644
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
Fix patch "Faster redstone torch rapid clock removal" (#2014) Tux pointed out the patch still has O(n^2) time complexity since the sublist class in arraylist does not override clear() from AbstractList, which uses a forward moving iterator to clear the list. Resolved by using a peek and poll from ArrayDeque. This patch also removes the useless WeakHashMap which holds the list (it mapped world->list) and replaces it with a field on World.
2019-05-10 15:48:58 +00:00
@@ -209,6 +209,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
More 1.14 work
2019-04-27 06:26:04 +00:00
return i < 0 || i >= 256;
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
}
+ public boolean isLoaded(BlockPosition blockposition) {
+ return getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; // Paper
+ }
+
// Paper start
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
public boolean isLoadedAndInBounds(BlockPosition blockposition) {
return getWorldBorder().isInBounds(blockposition) && getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
--
Revert "Optimize Pathfinding" This patch appears to be causing some issues with 1.14.3 entity AI
2019-06-25 19:18:50 +00:00
2.22.0
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00