Merge Fixes

bundabrg · Sep 22, 2020 · 1f95c18 · 1f95c18
1 parent 01b2fc4
commit 1f95c18
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java b/...geysermc/connector/network/translators/world/block/entity/SkullBlockEntityTranslator.java
@@ -27,6 +27,7 @@
 
 import com.github.steveice10.mc.auth.data.GameProfile;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.nukkitx.math.vector.Vector3f;
@@ -68,12 +69,12 @@ public Map<String, Object> translateTag(com.github.steveice10.opennbt.tag.builti
     }
 
     @Override
-    public com.github.steveice10.opennbt.tag.builtin.CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
+    public CompoundTag getConstantJavaTag(String javaId, int x, int y, int z) {
         return null;
     }
 
     @Override
-    public NbtMap getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
+    public NbtMap getConstantBedrockTag(String bedrockId, int x, int y, int z) {
         return getConstantBedrockTag(bedrockId, x, y, z).toBuilder()
                 .putFloat("Rotation", 0f)
                 .putByte("SkullType", (byte) 0)