Spigot / CraftBukkit / b4230a9a7ef

Commits

md_5 authored b4230a9a7ef 22 Oct 2018

Update to Minecraft 1.13.2

Modified


22 22
23 23	try {
24 24	jsonreader.setLenient(false);
25 25	- Dynamic dynamic = new Dynamic(JsonOps.INSTANCE, Streams.parse(jsonreader));
26 26	+ Dynamic<?> dynamic = new Dynamic(JsonOps.INSTANCE, Streams.parse(jsonreader)); // CraftBukkit - decompile error
27 27
28 28	if (!dynamic.get("DataVersion").flatMap(Dynamic::getNumberValue).isPresent()) {
29 29	dynamic = dynamic.set("DataVersion", dynamic.createInt(1343));
30 30	@@ -148,7 +148,7 @@
31 31
32 -	dynamic = this.d.az().update(DataFixTypes.ADVANCEMENTS, dynamic, dynamic.getInt("DataVersion"), 1628);
32 +	dynamic = this.d.az().update(DataFixTypes.ADVANCEMENTS, dynamic, dynamic.getInt("DataVersion"), 1631);
33 33	dynamic = dynamic.remove("DataVersion");
34 34	- Map map = (Map) AdvancementDataPlayer.b.getAdapter(AdvancementDataPlayer.c).fromJsonTree((JsonElement) dynamic.getValue());
35 35	+ Map<MinecraftKey, AdvancementProgress> map = (Map) AdvancementDataPlayer.b.getAdapter(AdvancementDataPlayer.c).fromJsonTree((JsonElement) dynamic.getValue()); // CraftBukkit - decompile error
36 36
37 37	if (map == null) {
38 38	throw new JsonParseException("Found null for advancements");
39 39	@@ -162,7 +162,11 @@
40 40	Advancement advancement = this.d.getAdvancementData().a((MinecraftKey) entry.getKey());
41 41
42 42	if (advancement == null) {