Remove extra chunkGC call left over after CraftBukkit merge

By: Aikar <aikar@aikar.co>
This commit is contained in:
Spigot
2013-02-19 15:10:01 -05:00
parent 061fdf3d06
commit 587fe30827
2 changed files with 20 additions and 28 deletions

View File

@@ -1,4 +1,4 @@
From 907247991e7afc81ee0d550d53450e8999422fa0 Mon Sep 17 00:00:00 2001
From c7e5718f1f1357d6dccdde091ee8598abc120cc1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Add Custom Timings to various points
@@ -274,7 +274,7 @@ index e2426bc..9b7bc02 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 842d722..eb268ad 100644
index 4aa2a19..6cb3e24 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -157,9 +157,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -287,10 +287,10 @@ index 842d722..eb268ad 100644
}
// CraftBukkit end
+ timings.doTickRest.startTiming(); // Spigot
this.getWorld().processChunkGC(); // Spigot
this.methodProfiler.c("chunkSource");
this.chunkProvider.unloadChunks();
@@ -187,6 +190,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
int j = this.a(1.0F);
@@ -186,6 +189,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
this.V();
this.getWorld().processChunkGC(); // CraftBukkit
@@ -325,5 +325,5 @@ index 0000000..bb0c191
+ }
+}
--
1.8.1-rc2
1.8.1.1