1 files changed, 12 insertions, 11 deletions
diff --git a/src/main/java/re/jag/parquet/mixin/ServerPlayerEntityMixin.java b/src/main/java/re/jag/parquet/mixin/ServerPlayerEntityMixin.java
index 2a96568..b636f2d 100644
--- a/src/main/java/re/jag/parquet/mixin/ServerPlayerEntityMixin.java
+++ b/src/main/java/re/jag/parquet/mixin/ServerPlayerEntityMixin.java
@@ -19,9 +19,9 @@ import net.minecraft.server.world.ServerWorld;
 import net.minecraft.world.World;
 import re.jag.parquet.interfaces.CameraModeData;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtList;
+import net.minecraft.nbt.NbtElement;
 
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin extends PlayerEntity implements CameraModeData{
@@ -42,8 +42,8 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity implements Ca
 	public void teleport(ServerWorld arg, double d, double e, double f, float g, float h) {}
 	
 	@Inject(method="writeCustomDataToTag", at = @At("RETURN"))
-	private void onWriteCustomDataToTag(CompoundTag arg, CallbackInfo ci) {
-		arg.put("ParquetSavedPos", (Tag)toListTag(new double[] { saved_x, saved_y, saved_z, saved_yaw, saved_pitch }));
+	private void onWriteCustomDataToTag(NbtCompound arg, CallbackInfo ci) {
+		arg.put("ParquetSavedPos", (NbtElement) toNbtList(new double[] { saved_x, saved_y, saved_z, saved_yaw, saved_pitch }));
 
 		arg.putString("ParquetSavedDimension", this.saved_dimension);
 
@@ -51,8 +51,8 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity implements Ca
 	}
 	
 	@Inject(method="readCustomDataFromTag", at = @At("RETURN"))
-	private void onReadCustomDataFromTag(CompoundTag arg, CallbackInfo ci) {
-		ListTag lv = arg.getList("ParquetSavedPos", 6);
+	private void onReadCustomDataFromTag(NbtCompound arg, CallbackInfo ci) {
+		NbtList lv = arg.getList("ParquetSavedPos", 6);
 
 		this.saved_dimension = arg.getString("ParquetSavedDimension");
 		
@@ -74,8 +74,9 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity implements Ca
 			this.saved_y = getY();
 			this.saved_z = getZ();
 
-			this.saved_pitch = pitch;
-			this.saved_yaw = yaw;
+
+			this.saved_pitch = getPitch();
+			this.saved_yaw = getYaw();
 
 			this.saved_dimension = this.world.getRegistryKey().getValue().toString();
 
@@ -88,8 +89,8 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity implements Ca
 	
 	public boolean restoreCameraPosition() {
 		if (this.save_active) {
-			this.teleport(server.getWorld( RegistryKey.of(Registry.DIMENSION, new Identifier(this.saved_dimension))) , saved_x, saved_y, saved_z, saved_yaw, saved_pitch);
-			
+			this.teleport(server.getWorld( RegistryKey.of(Registry.WORLD_KEY, new Identifier(this.saved_dimension))) , saved_x, saved_y, saved_z, saved_yaw, saved_pitch);
+
 			this.save_active = false;
 			
 			return true;