mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct syncChunkLoadPostTimer stop position.

Browse source
This commit is contained in:
md_5 2016-03-05 16:38:55 +11:00 committed by Zach Brown
parent 417017308c
commit 4b2212247d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CraftBukkit-Patches/0010-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 75bae478c72d0bb8d5394543a622b11f89604f45 Mon Sep 17 00:00:00 2001 From ec2afa95dfc360d1ec483bfbedcab6e049d9e7a8 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
@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Timings
Overhauls the Timings System adding performance tracking all around the Minecraft Server Overhauls the Timings System adding performance tracking all around the Minecraft Server
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 582e684..8345e87 100644 index 582e684..7980e80 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -834,6 +834,7 @@ public class Chunk { @@ -834,6 +834,7 @@ public class Chunk {
@ -17,14 +17,14 @@ index 582e684..8345e87 100644
Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1); Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1);
Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ); Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ);
Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1); Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1);
@@ -895,6 +896,7 @@ public class Chunk { @@ -858,6 +859,7 @@ public class Chunk {
this.e(); chunk4.a(chunkgenerator);
}
} }
+ world.timings.syncChunkLoadPostTimer.stopTiming(); // Spigot + world.timings.syncChunkLoadPostTimer.stopTiming(); // Spigot
} }
public BlockPosition f(BlockPosition blockposition) {
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 01729cb..780919a 100644 index 01729cb..780919a 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java