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

Update to latest upstream

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-05-04 09:24:15 +10:00
parent d8b3cd4a33
commit 326c461585
25 changed files with 74 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d1df9385f8b785885e766baf48c136c43f78cafb Mon Sep 17 00:00:00 2001
From 2618c34301c92122133a456f41ce4649bb552f0f 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
@@ -213,10 +213,10 @@ index 3c80340..044db9f 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 0f6a0ae..51cc2ab 100644
index bc55a77..2e1246e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -963,6 +963,7 @@ public class PlayerConnection extends Connection {
@@ -962,6 +962,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit end
private void handleCommand(String s) {
@@ -224,7 +224,7 @@ index 0f6a0ae..51cc2ab 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -970,19 +971,23 @@ public class PlayerConnection extends Connection {
@@ -969,19 +970,23 @@ public class PlayerConnection extends Connection {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -266,7 +266,7 @@ index db3fc42..174546d 100644
private static Map b = new HashMap();
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9a3c492..b87865d 100644
index 6d59bc3..feb657b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -13,6 +13,7 @@ import java.util.concurrent.Callable;