@@ -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()) {
|
||||
|
||||
Reference in New Issue
Block a user