mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source
This commit is contained in:
Zach Brown 2016-07-30 18:02:34 -05:00
commit 46bfd418a8
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
9 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Spigot-API-Patches/0019-Add-exception-reporting-event.patch
View file

@ -1,4 +1,4 @@
From 971a2074ef245da993d3833bc30996d71364db96 Mon Sep 17 00:00:00 2001
From 0a66e97d6b38306199e8b76d2459c3a53beff3c5 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:24:35 -0600
Subject: [PATCH] Add exception reporting event
@ -458,10 +458,10 @@ index 0000000..5582999
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index fc5bc77..3a7b4b6 100644
index ba4d45c..8e70b43 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -11,6 +11,9 @@ import java.util.List;
@@ -10,6 +10,9 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
@ -471,7 +471,7 @@ index fc5bc77..3a7b4b6 100644
import org.apache.commons.lang.Validate;
import org.bukkit.Location;
import org.bukkit.Server;
@@ -153,7 +156,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -152,7 +155,9 @@ public class SimpleCommandMap implements CommandMap {
throw ex;
} catch (Throwable ex) {
target.timings.stopTiming(); // Spigot
@ -482,7 +482,7 @@ index fc5bc77..3a7b4b6 100644
}
// return true as command was handled
@@ -230,7 +235,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -229,7 +234,9 @@ public class SimpleCommandMap implements CommandMap {
} catch (CommandException ex) {
throw ex;
} catch (Throwable ex) {
@ -494,7 +494,7 @@ index fc5bc77..3a7b4b6 100644
}
// Paper end
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 1325b03..49f5872 100644
index 4ee123e..1302773 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -18,6 +18,9 @@ import java.util.logging.Level;
@ -587,5 +587,5 @@ index 1325b03..49f5872 100644
}
}
--
2.8.2
2.9.2.windows.1