Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 05:55:44 +01:00
Code Issues Projects Releases Wiki Activity

Add missed chunkGC timings start

Browse Source 
Pointed out by Andi in Spigot #53
This commit is contained in:
md_5 2016-03-03 20:22:48 +11:00 committed by Zach Brown
parent f3147c4451
commit c169c4a685
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CraftBukkit-Patches/0010-Spigot-Timings.patch
View File

@ -1,4 +1,4 @@
From c3a5cd66a0f950ba650db985addaed64f5f9674b Mon Sep 17 00:00:00 2001 From d717ec80e25786019b396d00fb62f8cabf37844f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500 Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings Subject: [PATCH] Spigot Timings
@ -515,7 +515,7 @@ index c5c7503..11e8de4 100644
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 250a9f0..8678daa 100644 index 250a9f0..ca04f24 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -219,10 +219,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -219,10 +219,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -532,7 +532,7 @@ index 250a9f0..8678daa 100644
this.methodProfiler.c("chunkSource"); this.methodProfiler.c("chunkSource");
this.chunkProvider.unloadChunks(); this.chunkProvider.unloadChunks();
int j = this.a(1.0F); int j = this.a(1.0F);
@@ -236,21 +239,35 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -236,21 +239,36 @@ public class WorldServer extends World implements IAsyncTaskHandler {
this.worldData.setDayTime(this.worldData.getDayTime() + 1L); this.worldData.setDayTime(this.worldData.getDayTime() + 1L);
} }
@ -563,6 +563,7 @@ index 250a9f0..8678daa 100644
this.ao(); this.ao();
+ timings.doSounds.stopTiming(); // Spigot + timings.doSounds.stopTiming(); // Spigot
+ timings.doChunkGC.startTiming();// Spigot
this.getWorld().processChunkGC(); // CraftBukkit this.getWorld().processChunkGC(); // CraftBukkit
+ timings.doChunkGC.stopTiming(); // Spigot + timings.doChunkGC.stopTiming(); // Spigot
} }

6
CraftBukkit-Patches/0029-Allow-Disabling-of-Random-Lighting-Updates.patch
View File

@ -1,4 +1,4 @@
From f61f7fe44fc668187ee973cff84b74ed8d0b7e99 Mon Sep 17 00:00:00 2001 From 71cd35a1527593f3c82c7461ce9552af19e3018a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000 Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates Subject: [PATCH] Allow Disabling of Random Lighting Updates
@ -18,10 +18,10 @@ index e4725b0..20b945c 100644
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f8a2195..7823174 100644 index ca04f24..ffbb05d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -373,7 +373,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -374,7 +374,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
protected void i() { protected void i() {
this.methodProfiler.a("playerCheckLight"); this.methodProfiler.a("playerCheckLight");

6
CraftBukkit-Patches/0135-Limit-TNT-Detonations-per-tick.patch
View File

@ -1,4 +1,4 @@
From 847098ee587927d368ea75de08e1cd65f3aba0b4 Mon Sep 17 00:00:00 2001 From e9a46ef63c6712195a25c4d7eebb571759487cc1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400 Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick Subject: [PATCH] Limit TNT Detonations per tick
@ -19,10 +19,10 @@ index e467aff..35ed2a6 100644
this.lastY = this.locY; this.lastY = this.locY;
this.lastZ = this.locZ; this.lastZ = this.locZ;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0d6f5af..c2ca2df 100644 index b666996..46004f0 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -625,6 +625,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -626,6 +626,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
this.worldProvider.r(); this.worldProvider.r();
super.tickEntities(); super.tickEntities();