diff options
| author | md_5 <git@md-5.net> | 2017-08-03 23:00:00 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-08-03 23:00:00 +1000 |
| commit | 2a927e8638f66bb076b68ae8a0d1d0ee9ae72732 (patch) | |
| tree | 2c786eaa235b2d865b2050d079863825db456459 /nms-patches/AdvancementDataPlayer.patch | |
| parent | 9a1fc1e2eea898d2839c9f43d5b6eccd13bba090 (diff) | |
| download | craftbukkit-2a927e8638f66bb076b68ae8a0d1d0ee9ae72732.tar craftbukkit-2a927e8638f66bb076b68ae8a0d1d0ee9ae72732.tar.gz craftbukkit-2a927e8638f66bb076b68ae8a0d1d0ee9ae72732.tar.lz craftbukkit-2a927e8638f66bb076b68ae8a0d1d0ee9ae72732.tar.xz craftbukkit-2a927e8638f66bb076b68ae8a0d1d0ee9ae72732.zip | |
Update to Minecraft 1.12.1
Diffstat (limited to 'nms-patches/AdvancementDataPlayer.patch')
| -rw-r--r-- | nms-patches/AdvancementDataPlayer.patch | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/nms-patches/AdvancementDataPlayer.patch b/nms-patches/AdvancementDataPlayer.patch index 84c937c4..947510a9 100644 --- a/nms-patches/AdvancementDataPlayer.patch +++ b/nms-patches/AdvancementDataPlayer.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/AdvancementDataPlayer.java +++ b/net/minecraft/server/AdvancementDataPlayer.java -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ private static final Logger a = LogManager.getLogger(); private static final Gson b = (new GsonBuilder()).registerTypeAdapter(AdvancementProgress.class, new AdvancementProgress.a()).registerTypeAdapter(MinecraftKey.class, new MinecraftKey.a()).setPrettyPrinting().create(); @@ -9,7 +9,7 @@ }; private final MinecraftServer d; private final File e; -@@ -92,7 +92,7 @@ +@@ -93,7 +93,7 @@ Iterator iterator = this.data.entrySet().iterator(); while (iterator.hasNext()) { @@ -18,25 +18,16 @@ if (((AdvancementProgress) entry.getValue()).isDone()) { arraylist.add(entry.getKey()); -@@ -128,13 +128,15 @@ +@@ -129,7 +129,7 @@ if (this.e.isFile()) { try { String s = Files.toString(this.e, StandardCharsets.UTF_8); - Map map = (Map) ChatDeserializer.a(AdvancementDataPlayer.b, s, AdvancementDataPlayer.c.getType()); -+ // CraftBukkit start -+ Map<MinecraftKey, AdvancementProgress> map = (Map) ChatDeserializer.a(AdvancementDataPlayer.b, s, AdvancementDataPlayer.c.getType()); ++ Map<MinecraftKey, AdvancementProgress> map = (Map) ChatDeserializer.a(AdvancementDataPlayer.b, s, AdvancementDataPlayer.c.getType()); // CraftBukkit if (map == null) { throw new JsonParseException("Found null for advancements"); - } - -- Stream stream = map.entrySet().stream().sorted(Comparator.comparing(apply<invokedynamic>())); -+ Stream stream = map.entrySet().stream().sorted(Comparator.comparing(Entry::getValue)); -+ // CraftBukkit end - Iterator iterator = ((List) stream.collect(Collectors.toList())).iterator(); - - while (iterator.hasNext()) { -@@ -142,7 +144,11 @@ +@@ -143,7 +143,11 @@ Advancement advancement = this.d.getAdvancementData().a((MinecraftKey) entry.getKey()); if (advancement == null) { @@ -49,7 +40,7 @@ } else { this.a(advancement, (AdvancementProgress) entry.getValue()); } -@@ -194,6 +200,7 @@ +@@ -195,6 +199,7 @@ this.i.add(advancement); flag = true; if (!flag1 && advancementprogress.isDone()) { |