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

Upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-18 17:48:18 +11:00
parent be8c216be7
commit 72cde1fd01
36 changed files with 109 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0016-Improved-Timings-System.patch
View File

@@ -1,4 +1,4 @@
From d8e3dd9843d4506465935ccfb39c6c1e9188f600 Mon Sep 17 00:00:00 2001
From 7afd251cfd6c1348e94d6ee6fbd649dace08c51b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System
@@ -6,10 +6,10 @@ Subject: [PATCH] Improved Timings System
Tracks nearly every point of minecraft internals and plugin events to give a good quick overview on what is causing TPS loss.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 2f842c3..88853ca 100644
index 9c99177..b88f75c 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -107,6 +107,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -106,6 +106,7 @@ public class ChunkProviderServer implements IChunkProvider {
// CraftBukkit end
if (chunk == null) {
@@ -17,7 +17,7 @@ index 2f842c3..88853ca 100644
chunk = this.loadChunk(i, j);
if (chunk == null) {
if (this.chunkProvider == null) {
@@ -143,6 +144,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -141,6 +142,7 @@ public class ChunkProviderServer implements IChunkProvider {
}
// CraftBukkit end
chunk.a(this, this, i, j);
@@ -26,7 +26,7 @@ index 2f842c3..88853ca 100644
// CraftBukkit start - If we didn't need to load the chunk run the callback now
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index fec07f8..0c1350e 100644
index dc0abc5..3d6aeff 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
@@ -145,7 +145,7 @@ index ce2aaf4..453e508 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d32bf3f..d34fea7 100644
index e3bd043..9cab7a9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -914,6 +914,7 @@ public class PlayerConnection implements PacketPlayInListener {