NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...
This commit is contained in:
@@ -40,7 +40,7 @@ index cadff64bf..b1e0d6185 100644
|
||||
case TRAPPED_CHEST:
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
||||
new file mode 100644
|
||||
index 000000000..dc372f6db
|
||||
index 000000000..30941c7b0
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
||||
@@ -0,0 +0,0 @@
|
||||
@@ -48,12 +48,16 @@ index 000000000..dc372f6db
|
||||
+
|
||||
+import com.destroystokyo.paper.inventory.meta.ArmorStandMeta;
|
||||
+import com.google.common.collect.ImmutableMap;
|
||||
+import com.mojang.datafixers.Dynamic;
|
||||
+
|
||||
+import net.minecraft.server.DataConverterTypes;
|
||||
+import net.minecraft.server.DynamicOpsNBT;
|
||||
+import net.minecraft.server.MinecraftServer;
|
||||
+import net.minecraft.server.NBTBase;
|
||||
+import net.minecraft.server.NBTTagCompound;
|
||||
+import org.bukkit.Material;
|
||||
+import org.bukkit.configuration.serialization.DelegateDeserialization;
|
||||
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
|
||||
+
|
||||
+import java.util.Map;
|
||||
+
|
||||
@@ -220,7 +224,7 @@ index 000000000..dc372f6db
|
||||
+
|
||||
+ if (tag.hasKey(ENTITY_TAG.NBT)) {
|
||||
+ entityTag = tag.getCompound(ENTITY_TAG.NBT);
|
||||
+ MinecraftServer.getServer().dataConverterManager.a(DataConverterTypes.ENTITY, entityTag); // PAIL: convert
|
||||
+ MinecraftServer.getServer().dataConverterManager.update(DataConverterTypes.ENTITY, new Dynamic(DynamicOpsNBT.a, entityTag), -1, CraftMagicNumbers.DATA_VERSION);
|
||||
+
|
||||
+ if (entityTag.hasKey(INVISIBLE.NBT)) {
|
||||
+ invisible = entityTag.getBoolean(INVISIBLE.NBT);
|
||||
@@ -343,7 +347,7 @@ index 000000000..dc372f6db
|
||||
+ CraftMetaArmorStand clone = (CraftMetaArmorStand) super.clone();
|
||||
+
|
||||
+ if (entityTag != null) {
|
||||
+ clone.entityTag = entityTag.g();
|
||||
+ clone.entityTag = entityTag.clone();
|
||||
+ }
|
||||
+
|
||||
+ return clone;
|
||||
|
||||
Reference in New Issue
Block a user