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

10
Bukkit-Patches/0002-Measure-Timings-Duration.patch
View File

@@ -1,11 +1,11 @@
From f20ab58bf8d3bcf2d7fe5e8275d3127874bbd61a Mon Sep 17 00:00:00 2001
From 33cf8909fd2af5abf1f2a64b7bc3ff1ecdc9e9b8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Measure Timings Duration
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
index 29ebbe0..3c4ef89 100644
index 05cfcb0..c2874f1 100644
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
@@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableList;
@@ -37,10 +37,10 @@ index 29ebbe0..3c4ef89 100644
if (separate) sender.sendMessage("Names written to " + names.getPath());
} catch (IOException e) {
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 93fb4f5..a96a33b 100644
index 3c9611b..2c4b03b 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -274,6 +274,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -275,6 +275,7 @@ public final class SimplePluginManager implements PluginManager {
}
}
@@ -49,5 +49,5 @@ index 93fb4f5..a96a33b 100644
}
--
1.8.1.2
1.8.3.2