OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Spigot-Server-Patches/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
View file

@ -52,7 +52,7 @@ index 39b136935..7fcc8c52d 100644
public boolean captureBlockStates = false;
public boolean captureTreeGeneration = false;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5e6601d0f..110d6e571 100644
index 7d99d34ae..0cd48c5bc 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Chunk-registration-fixes.patch
View file

@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
Keep them consistent
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f606a7340..38e618c78 100644
index 8bac56350..f84e727d9 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Configurable-spawn-chances-for-skeleton-horses.patch
View file

@ -22,7 +22,7 @@ index 64146effd..cc81e1cae 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index fe20687b2..8307379e9 100644
index 280932ce1..38bbb3ce2 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Disable-ice-and-snow.patch
View file

@ -19,7 +19,7 @@ index 41436a4ea..f53d8b967 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 465cda646..fe20687b2 100644
index 09a1f3ce3..280932ce1 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Disable-thunder.patch
View file

@ -19,7 +19,7 @@ index 25e071718..41436a4ea 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 90f08db30..465cda646 100644
index 4b619dc3d..09a1f3ce3 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Entity-AddTo-RemoveFrom-World-Events.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 30c9cfa12..64b80441f 100644
index 70b8b41ea..5a813c93f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Entity-Origin-API.patch
View file

@ -101,7 +101,7 @@ index 22035b6c0..342484373 100644
if (i >= 0 && i < this.list.size()) {
NBTBase nbtbase = (NBTBase) this.list.get(i);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c38963526..90f08db30 100644
index e4eee465a..4b619dc3d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch
View file

@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 38e618c78..4a2e66977 100644
index f84e727d9..8a8c2eaf5 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Fix-Double-World-Add-issues.patch
View file

@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
Also add debug if something else tries to, and abort before world gets bad state
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ea9899889..f606a7340 100644
index bba5013d2..8bac56350 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Ignore-Dead-Entities-in-entityList-iteration.patch
View file

@ -63,7 +63,7 @@ index be8f6ac99..4a931aaf4 100644
public float getBukkitYaw() {
return this.yaw;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 110d6e571..afae55973 100644
index 0cd48c5bc..f4d6c68f4 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
View file

@ -102,7 +102,7 @@ index a56ac3da8..2f1be1995 100644
for ( org.bukkit.map.MapCursor cursor : render.cursors) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f03e562c3..ea9899889 100644
index 8b17fb4b4..bba5013d2 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/InventoryCloseEvent-Reason-API.patch
View file

@ -114,7 +114,7 @@ index 002f7e844..fd0f5c6f2 100644
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
cserver.getPluginManager().callEvent(playerQuitEvent);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 4a2e66977..004a06b4b 100644
index 8a8c2eaf5..eb311a731 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Re-add-vanilla-entity-warnings-for-duplicates.patch
View file

@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
We should kind of know about these things you know.
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 004a06b4b..5e6601d0f 100644
index eb311a731..7d99d34ae 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch
View file

@ -67,7 +67,7 @@ index 57633955c..7d5f6e220 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 64b80441f..f03e562c3 100644
index 5a813c93f..8b17fb4b4 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

2
Spigot-Server-Patches/Send-nearby-packets-from-world-player-list-not-serve.patch
View file

@ -46,7 +46,7 @@ index fd0f5c6f2..e46436623 100644
double d5 = d1 - entityplayer.locY();
double d6 = d2 - entityplayer.locZ();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index afae55973..640e40ef8 100644
index f4d6c68f4..a0c714129 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {

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();
}