Latest progress - restored patches, some issues resolved

This commit is contained in:
Aikar
2020-06-26 02:29:44 -04:00
parent bc5acdddad
commit fe2a0ea500
34 changed files with 338 additions and 478 deletions

View File

@@ -10,14 +10,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/BiomeBase.java
+++ b/src/main/java/net/minecraft/server/BiomeBase.java
@@ -0,0 +0,0 @@ public class BiomeBase {
protected final Map<WorldGenStage.Decoration, List<WorldGenFeatureConfigured<?, ?>>> r;
protected final List<WorldGenFeatureConfigured<?, ?>> s = Lists.newArrayList();
private final Map<StructureGenerator<?>, StructureFeature<?, ?>> u;
- private final Map<EnumCreatureType, List<BiomeBase.BiomeMeta>> v;
+ private final Map<EnumCreatureType, List<BiomeBase.BiomeMeta>> v = Maps.newEnumMap(EnumCreatureType.class); // Paper
private final Map<EntityTypes<?>, BiomeBase.e> w = Maps.newHashMap();
private final List<BiomeBase.d> x;
private final ThreadLocal<Long2FloatLinkedOpenHashMap> y = ThreadLocal.withInitial(() -> {
this.r.put(worldgenstage_decoration, Lists.newArrayList());
}
- this.v = Maps.newHashMap();
+ this.v = Maps.newEnumMap(EnumCreatureType.class); // Paper
EnumCreatureType[] aenumcreaturetype = EnumCreatureType.values();
i = aenumcreaturetype.length;
@@ -0,0 +0,0 @@ public class BiomeBase {
for (j = 0; j < i; ++j) {
EnumCreatureType enumcreaturetype = aenumcreaturetype[j];
@@ -27,6 +27,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
} else {
@@ -0,0 +0,0 @@ public class BiomeBase {
this.u = (Map) list.stream().collect(Collectors.toMap((structurefeature) -> {
return structurefeature.b;
}, Function.identity()));
- this.v = map2;
+ this.v = Maps.newEnumMap(EnumCreatureType.class); this.v.putAll(map2); // Paper
this.x = list1;
this.l = (String) optional.orElse(null); // Paper - decompile fix
Stream stream = map1.values().stream().flatMap(Collection::stream).filter((worldgenfeatureconfigured) -> {
@@ -0,0 +0,0 @@ public class BiomeBase {
return this.l;
}