Update to Minecraft 1.12-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-19 21:00:13 +10:00
parent 5284eb89a3
commit 530fe41851
47 changed files with 222 additions and 283 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/AdvancementDataPlayer.java
+++ b/net/minecraft/server/AdvancementDataPlayer.java
@@ -29,7 +29,7 @@
@@ -30,7 +30,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;
@@ -88,7 +88,7 @@
@@ -92,7 +92,7 @@
Iterator iterator = this.data.entrySet().iterator();
while (iterator.hasNext()) {
@@ -18,7 +18,7 @@
if (((AdvancementProgress) entry.getValue()).isDone()) {
arraylist.add(entry.getKey());
@@ -124,13 +124,15 @@
@@ -128,13 +128,15 @@
if (this.e.isFile()) {
try {
String s = Files.toString(this.e, StandardCharsets.UTF_8);
@@ -36,7 +36,7 @@
Iterator iterator = ((List) stream.collect(Collectors.toList())).iterator();
while (iterator.hasNext()) {
@@ -138,7 +140,11 @@
@@ -142,7 +144,11 @@
Advancement advancement = this.d.getAdvancementData().a((MinecraftKey) entry.getKey());
if (advancement == null) {
@@ -49,7 +49,7 @@
} else {
this.a(advancement, (AdvancementProgress) entry.getValue());
}
@@ -190,6 +196,7 @@
@@ -194,6 +200,7 @@
this.i.add(advancement);
flag = true;
if (!flag1 && advancementprogress.isDone()) {