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

Should probably do an upstream update.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-24 19:29:30 +10:00
parent 75ed907450
commit caa031dbae
15 changed files with 55 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 8606186a726ed47563cc3714dce414776efe0f19 Mon Sep 17 00:00:00 2001
From 63b6bcfae16694dce46b4b077fcea833212b367b 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
@@ -26,7 +26,7 @@ index b73f69c..17934c0 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 671384d..e095ae0 100644
index 50edbdb..76d9998 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;
@@ -144,10 +144,10 @@ index f025083..f52d619 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 ff685d5..54e96c2 100644
index 6aa7a21..1509a30 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -949,6 +949,7 @@ public class PlayerConnection extends Connection {
@@ -947,6 +947,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit end
private void handleCommand(String s) {
@@ -155,7 +155,7 @@ index ff685d5..54e96c2 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -956,19 +957,23 @@ public class PlayerConnection extends Connection {
@@ -954,19 +955,23 @@ public class PlayerConnection extends Connection {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {