Update upstream B/CB/S
This commit is contained in:
parent
e6473fc520
commit
ece0b19c59
8 changed files with 140 additions and 123 deletions
|
@ -1,4 +1,4 @@
|
|||
From 487fd736664c77fdc1da6257aadc398d7e9cdac3 Mon Sep 17 00:00:00 2001
|
||||
From 32c9f326e8bbb099b3143bd59e2c2cc1f4c850a4 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,7 +458,7 @@ index 00000000..5582999f
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index bdc0de8c..4aea03c6 100644
|
||||
index 38130cc3..75dfa95e 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -10,6 +10,9 @@ import java.util.List;
|
||||
|
@ -471,7 +471,7 @@ index bdc0de8c..4aea03c6 100644
|
|||
import org.apache.commons.lang.Validate;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Server;
|
||||
@@ -148,11 +151,14 @@ public class SimpleCommandMap implements CommandMap {
|
||||
@@ -147,11 +150,14 @@ public class SimpleCommandMap implements CommandMap {
|
||||
target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
|
||||
target.timings.stopTiming(); // Spigot
|
||||
} catch (CommandException ex) {
|
||||
|
@ -487,7 +487,7 @@ index bdc0de8c..4aea03c6 100644
|
|||
}
|
||||
|
||||
// return true as command was handled
|
||||
@@ -225,7 +231,9 @@ public class SimpleCommandMap implements CommandMap {
|
||||
@@ -223,7 +229,9 @@ public class SimpleCommandMap implements CommandMap {
|
||||
} catch (CommandException ex) {
|
||||
throw ex;
|
||||
} catch (Throwable ex) {
|
||||
|
@ -592,5 +592,5 @@ index 80c152ba..b88f31ca 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.19.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue