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

Upstream merge, nothing major.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-21 19:13:39 +11:00
parent c14cb5a15b
commit 2c6428f4b1
13 changed files with 39 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 7afd251cfd6c1348e94d6ee6fbd649dace08c51b Mon Sep 17 00:00:00 2001
From a8b402c382f45af96c4cb9be1c4679f8275ce338 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
@@ -64,7 +64,7 @@ index dc0abc5..3d6aeff 100644
protected String H() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ce2aaf4..453e508 100644
index 0966b4b..d740620 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -10,7 +10,6 @@ import java.util.ArrayList;
@@ -145,10 +145,10 @@ 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 e3bd043..9cab7a9 100644
index 29335ea..d0ea17a 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 {
@@ -917,6 +917,7 @@ public class PlayerConnection implements PacketPlayInListener {
// CraftBukkit end
private void handleCommand(String s) {
@@ -156,7 +156,7 @@ index e3bd043..9cab7a9 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -921,19 +922,23 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -924,19 +925,23 @@ public class PlayerConnection implements PacketPlayInListener {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {