SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup timings patch

Browse Source
This commit is contained in:
Shane Freeder
2019-12-12 03:06:23 +00:00
parent 9e866dc829
commit aaba069c86
16 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Spigot-Server-Patches/Timings-v2.patch
View File

@@ -1250,7 +1250,7 @@ index 66f74c106..542262fc8 100644
CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ecb356013..c38963526 100644
index ecb356013..e4eee465a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@
@@ -1278,16 +1278,11 @@ index ecb356013..c38963526 100644
+ }, IRegistry.BLOCK::getKey, IRegistry.BLOCK::get, this::b, "Blocks"); // Paper - Timings
this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
return fluidtype == null || fluidtype == FluidTypes.EMPTY;
+<<<<<<< HEAD
}, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a);
this.navigators = Sets.newHashSet();
+=======
- }, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a);
+ }, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a, "Fluids"); // Paper - Timings
+ this.H = Sets.newHashSet();
+>>>>>>> Timings v2
this.navigators = Sets.newHashSet();
this.I = new ObjectLinkedOpenHashSet();
this.dataManager = worldnbtstorage;
this.server = minecraftserver;
@@ -0,0 +0,0 @@ public class WorldServer extends World {
this.N();
this.a();
@@ -1306,12 +1301,8 @@ index ecb356013..c38963526 100644
+ timings.scheduledBlocks.stopTiming(); // Spigot
gameprofilerfiller.exitEnter("raid");
+<<<<<<< HEAD
this.persistentRaid.a();
+=======
+ this.timings.raids.startTiming(); // Paper - timings
+ this.c.a();
+>>>>>>> Timings v2
this.persistentRaid.a();
if (this.mobSpawnerTrader != null) {
this.mobSpawnerTrader.a();
}