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
2014-01-15 20:28:26 +11:00
parent e4f2987e65
commit 1180c5cc83
15 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Bukkit-Patches/0004-Enchanced-Timings.patch
View File

@@ -1,4 +1,4 @@
From 91d36c0322fccafa061f0375eaed02cda0a19447 Mon Sep 17 00:00:00 2001
From a5a929cfee543a7e70b46c81e2ff3a18447012c1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 11:17:05 +1000
Subject: [PATCH] Enchanced Timings
@@ -166,10 +166,10 @@ index e09234c..ab2c65e 100644
/**
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index ea30d83..d905435 100644
index 57681dc..075695c 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -430,7 +430,7 @@ public class JavaPluginLoader implements PluginLoader {
@@ -323,7 +323,7 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
};

6
Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch
View File

@@ -1,14 +1,14 @@
From 9f356ddcc7487abf849f336e32efe87d3505f4c7 Mon Sep 17 00:00:00 2001
From 9fa22f91e7a72a105765b2a1b512d7c199b03980 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 18 Dec 2013 10:19:50 +1100
Subject: [PATCH] Allow for fallback commands to be removed.
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index c2f488a..9283b23 100644
index d178ad0..8dafd02 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -330,4 +330,18 @@ public class SimpleCommandMap implements CommandMap {
@@ -332,4 +332,18 @@ public class SimpleCommandMap implements CommandMap {
}
}
}