Update upstream B/CB/S

Remove two features added upstream
This commit is contained in:
Zach Brown
2016-08-27 18:41:58 -05:00
parent a9481ee3c7
commit fcbbc76319
14 changed files with 29 additions and 697 deletions

View File

@@ -492,7 +492,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ throw new CommandException(msg, ex);
}
}
// Paper end
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java