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

Upstream Merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-10-24 21:23:24 +11:00
parent dbe0e9acde
commit 9658a61088
19 changed files with 90 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 85337aff36373256de0d97501f509d6d83642d83 Mon Sep 17 00:00:00 2001
From 8eccd95e302141a9334eac45ed42f09658e99ac3 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
@@ -63,7 +63,7 @@ index 2158088..d65c123 100644
protected void D() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 830abcd..fba219f 100644
index d3a4265..dec46bd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -7,7 +7,6 @@ import java.security.KeyPair;
@@ -144,10 +144,10 @@ index 830abcd..fba219f 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 a5d7500..ad65a6a 100644
index e4cb5c7..8443731 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -944,6 +944,7 @@ public class PlayerConnection extends Connection {
@@ -953,6 +953,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit end
private void handleCommand(String s) {
@@ -155,7 +155,7 @@ index a5d7500..ad65a6a 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -951,19 +952,23 @@ public class PlayerConnection extends Connection {
@@ -960,19 +961,23 @@ public class PlayerConnection extends Connection {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -299,7 +299,7 @@ index ebbda63..3143d6e 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index bff9c6a..c1239f1 100644
index 88a9f88..3afcc0e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -179,9 +179,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -543,5 +543,5 @@ index 55db3ff..7d294c0 100644
}
--
1.8.1.2
1.8.3.2