summaryrefslogtreecommitdiffstats
path: root/nms-patches/AdvancementRewards.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-05-21 10:28:07 +1000
committermd_5 <git@md-5.net>2017-05-21 10:28:07 +1000
commitc7920f4302bce2042aa9c5d1d121e488cb88f7f0 (patch)
tree557f270fcf58297ba03488625c95e39634cf7808 /nms-patches/AdvancementRewards.patch
parent24147056e079d2913c7b222584fc26a48a3fee05 (diff)
downloadcraftbukkit-c7920f4302bce2042aa9c5d1d121e488cb88f7f0.tar
craftbukkit-c7920f4302bce2042aa9c5d1d121e488cb88f7f0.tar.gz
craftbukkit-c7920f4302bce2042aa9c5d1d121e488cb88f7f0.tar.lz
craftbukkit-c7920f4302bce2042aa9c5d1d121e488cb88f7f0.tar.xz
craftbukkit-c7920f4302bce2042aa9c5d1d121e488cb88f7f0.zip
SPIGOT-3257: Issue with AdvancementRewards function
Diffstat (limited to 'nms-patches/AdvancementRewards.patch')
-rw-r--r--nms-patches/AdvancementRewards.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/nms-patches/AdvancementRewards.patch b/nms-patches/AdvancementRewards.patch
new file mode 100644
index 00000000..50852ea2
--- /dev/null
+++ b/nms-patches/AdvancementRewards.patch
@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/AdvancementRewards.java
++++ b/net/minecraft/server/AdvancementRewards.java
+@@ -98,7 +98,7 @@
+ }
+
+ public boolean getSendCommandFeedback() {
+- return minecraftserver.worldServer[0].getGameRules().getBoolean("commandBlockOutput");
++ return minecraftserver.worlds.get(0).getGameRules().getBoolean("commandBlockOutput"); // CraftBukkit
+ }
+
+ public void a(CommandObjectiveExecutor.EnumCommandResult commandobjectiveexecutor_enumcommandresult, int i) {
+@@ -156,7 +156,7 @@
+ return new AdvancementRewards(i, aminecraftkey, aminecraftkey1, customfunction_a);
+ }
+
+- public Object deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
++ public AdvancementRewards deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // CraftBukkit - decompile error
+ return this.a(jsonelement, type, jsondeserializationcontext);
+ }
+ }