c0936a71bd
Upstream has released updates that appear 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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
53 Zeilen
2.5 KiB
Diff
53 Zeilen
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Sat, 4 Apr 2020 17:00:20 -0700
|
|
Subject: [PATCH] Consolidate flush calls for entity tracker packets
|
|
|
|
Most server packets seem to be sent from here, so try to avoid
|
|
expensive flush calls from them.
|
|
|
|
This change was motivated due to local testing:
|
|
|
|
- My server spawn has 130 cows in it (for testing a prev. patch)
|
|
- Try to let 200 players join spawn
|
|
|
|
Without this change, I could only get 20 players on before they
|
|
all started timing out due to the load put on the Netty I/O threads.
|
|
|
|
With this change I could get all 200 on at 0ms ping.
|
|
|
|
(one of the primary issues is that my CPU is kinda trash, and having
|
|
4 extra threads at 100% is just too much for it).
|
|
|
|
So in general this patch should reduce Netty I/O thread load.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
index 2a31265ac49b7a6e32105530d00952ee0c0d4331..488a253e218409b5f0b4a872cee0928578fa7582 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
@@ -656,7 +656,24 @@ public class ServerChunkCache extends ChunkSource {
|
|
this.level.timings.broadcastChunkUpdates.stopTiming(); // Paper - timing
|
|
gameprofilerfiller.pop();
|
|
// Paper end - use set of chunks requiring updates, rather than iterating every single one loaded
|
|
+ // Paper start - controlled flush for entity tracker packets
|
|
+ List<net.minecraft.network.Connection> disabledFlushes = new java.util.ArrayList<>(this.level.players.size());
|
|
+ for (ServerPlayer player : this.level.players) {
|
|
+ net.minecraft.server.network.ServerGamePacketListenerImpl connection = player.connection;
|
|
+ if (connection != null) {
|
|
+ connection.connection.disableAutomaticFlush();
|
|
+ disabledFlushes.add(connection.connection);
|
|
+ }
|
|
+ }
|
|
+ try { // Paper end - controlled flush for entity tracker packets
|
|
this.chunkMap.tick();
|
|
+ // Paper start - controlled flush for entity tracker packets
|
|
+ } finally {
|
|
+ for (net.minecraft.network.Connection networkManager : disabledFlushes) {
|
|
+ networkManager.enableAutomaticFlush();
|
|
+ }
|
|
+ }
|
|
+ // Paper end - controlled flush for entity tracker packets
|
|
}
|
|
}
|
|
|