core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0333-Use-more-reasonable-th...

23 lines
910 B
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 94e1e0a7e2a64a81a3f3a7a34c2553fbb5092333 Mon Sep 17 00:00:00 2001
Improve default thread counts for DataFix BootStrap Spigot capped it to 2 threads. This bumps it back up to do maxcores -2 with a max cap of 6. A typical 4C8T system can use 6 threads and be done in 6 seconds. Server owners can use system property to override, but this improves the default.
2018-10-24 03:53:13 +00:00
From: Aikar <aikar@aikar.co>
Date: Tue, 23 Oct 2018 23:14:38 -0400
Subject: [PATCH] Use more reasonable thread count default for bootstrap
more 1.14 stuffs yay!
2019-05-05 11:12:32 +00:00
diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.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 59164684e..4e9d53fb5 100644
more 1.14 stuffs yay!
2019-05-05 11:12:32 +00:00
--- a/src/main/java/net/minecraft/server/SystemUtils.java
+++ b/src/main/java/net/minecraft/server/SystemUtils.java
Fix some issues on the list
2019-05-05 21:39:51 +00:00
@@ -66,7 +66,7 @@ public class SystemUtils {
more 1.14 stuffs yay!
2019-05-05 11:12:32 +00:00
}
Improve default thread counts for DataFix BootStrap Spigot capped it to 2 threads. This bumps it back up to do maxcores -2 with a max cap of 6. A typical 4C8T system can use 6 threads and be done in 6 seconds. Server owners can use system property to override, but this improves the default.
2018-10-24 03:53:13 +00:00
more 1.14 stuffs yay!
2019-05-05 11:12:32 +00:00
private static ExecutorService k() {
- int i = MathHelper.clamp(Runtime.getRuntime().availableProcessors() - 1, 1, 7);
+ int i = Math.min(6, Math.max(Runtime.getRuntime().availableProcessors() - 2, 2)); // Paper - use more reasonable default - 2 is hard minimum to avoid using unlimited threads
Object object;
if (i <= 0) {
Improve default thread counts for DataFix BootStrap Spigot capped it to 2 threads. This bumps it back up to do maxcores -2 with a max cap of 6. A typical 4C8T system can use 6 threads and be done in 6 seconds. Server owners can use system property to override, but this improves the default.
2018-10-24 03:53:13 +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
Improve default thread counts for DataFix BootStrap Spigot capped it to 2 threads. This bumps it back up to do maxcores -2 with a max cap of 6. A typical 4C8T system can use 6 threads and be done in 6 seconds. Server owners can use system property to override, but this improves the default.
2018-10-24 03:53:13 +00:00