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

Move bad command registration workaround into SMP#dispatch

Browse source 
Fixes GH-274
This commit is contained in:
Zach Brown 2016-05-13 00:13:38 -05:00
parent 4cfcd525c4
commit 2304826f19
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
3 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From dec653a0fcd117f48e13a63d763fd7387d1d58a0 Mon Sep 17 00:00:00 2001
From 971a2074ef245da993d3833bc30996d71364db96 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 0000000..5582999
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 980c4fd..98b71e2 100644
index fc5bc77..3a7b4b6 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;
@ -471,7 +471,7 @@ index 980c4fd..98b71e2 100644
import org.apache.commons.lang.Validate;
import org.bukkit.Location;
import org.bukkit.Server;
@@ -147,7 +150,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -153,7 +156,9 @@ public class SimpleCommandMap implements CommandMap {
throw ex;
} catch (Throwable ex) {
target.timings.stopTiming(); // Spigot
@ -482,7 +482,7 @@ index 980c4fd..98b71e2 100644
}
// return true as command was handled
@@ -224,7 +229,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -230,7 +235,9 @@ public class SimpleCommandMap implements CommandMap {
} catch (CommandException ex) {
throw ex;
} catch (Throwable ex) {
@ -587,5 +587,5 @@ index 1325b03..49f5872 100644
}
}
--
2.8.0
2.8.2