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

10 years later...

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-01-28 09:46:19 +11:00
parent df59a4870c
commit 455deb1188
6 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CraftBukkit-Patches/0019-Add-Custom-Timings-to-various-points.patch
View File

@@ -1,4 +1,4 @@
From 5cfd2fa15e41201cc36959046d6a1c5ac860b265 Mon Sep 17 00:00:00 2001
From 8de0c8dfd462f4023fb85beb91afe4cf33d7ab30 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
@@ -210,7 +210,7 @@ index 43a24f5..7ca0acf 100644
/* CraftBukkit start - No longer needed as we have already handled it in server.dispatchServerCommand above.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 39e6110..46e8d11 100644
index e2426bc..9b7bc02 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -14,6 +14,7 @@ import java.util.concurrent.Callable;
@@ -221,7 +221,7 @@ index 39e6110..46e8d11 100644
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
@@ -113,6 +114,7 @@ public abstract class World implements IBlockAccess {
@@ -114,6 +115,7 @@ public abstract class World implements IBlockAccess {
final Object chunkLock = new Object();
private byte chunkTickRadius;
@@ -229,7 +229,7 @@ index 39e6110..46e8d11 100644
public CraftWorld getWorld() {
return this.world;
}
@@ -192,6 +194,7 @@ public abstract class World implements IBlockAccess {
@@ -193,6 +195,7 @@ public abstract class World implements IBlockAccess {
this.a();
this.getServer().addWorld(this.world); // CraftBukkit
@@ -237,7 +237,7 @@ index 39e6110..46e8d11 100644
}
protected abstract IChunkProvider j();
@@ -1206,6 +1209,7 @@ public abstract class World implements IBlockAccess {
@@ -1204,6 +1207,7 @@ public abstract class World implements IBlockAccess {
CrashReport crashreport;
CrashReportSystemDetails crashreportsystemdetails;
@@ -245,7 +245,7 @@ index 39e6110..46e8d11 100644
for (i = 0; i < this.i.size(); ++i) {
entity = (Entity) this.i.get(i);
// CraftBukkit start - fixed an NPE, don't process entities in chunks queued for unload
@@ -1260,7 +1264,9 @@ public abstract class World implements IBlockAccess {
@@ -1258,7 +1262,9 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.methodProfiler.c("regular");
@@ -255,7 +255,7 @@ index 39e6110..46e8d11 100644
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1313,7 +1319,9 @@ public abstract class World implements IBlockAccess {
@@ -1311,7 +1317,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
}
@@ -265,7 +265,7 @@ index 39e6110..46e8d11 100644
this.M = true;
Iterator iterator = this.tileEntityList.iterator();
@@ -1392,6 +1400,7 @@ public abstract class World implements IBlockAccess {
@@ -1390,6 +1398,7 @@ public abstract class World implements IBlockAccess {
this.a.clear();
}