diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
index 189c70dd7..5d078cfd6 100644
--- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
+++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java
@@ -62,7 +62,6 @@ public class ScriptPlayerEventHandler {
 
                 if(playerData.updateClient) {
                     NoppesUtilServer.sendPlayerDataCompound((EntityPlayerMP)player, playerData.getSyncNBT(), true);
-                    // VisibilityController.instance.onUpdate((EntityPlayerMP) player);
                     playerData.updateClient = false;
                 }
 
diff --git a/src/main/java/noppes/npcs/client/NoppesUtil.java b/src/main/java/noppes/npcs/client/NoppesUtil.java
index 70628c2f1..26bcade52 100644
--- a/src/main/java/noppes/npcs/client/NoppesUtil.java
+++ b/src/main/java/noppes/npcs/client/NoppesUtil.java
@@ -345,7 +345,7 @@ public class NoppesUtil {
                 ClientCacheHandler.playerData.setSyncNBT(compound);
             }
             else {
-                ClientCacheHandler.playerData.setNBT(compound);
+                ClientCacheHandler.playerData.setSyncNBTFull(compound);
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/src/main/java/noppes/npcs/controllers/SyncController.java b/src/main/java/noppes/npcs/controllers/SyncController.java
index 564e3e42a..094ba2e53 100644
--- a/src/main/java/noppes/npcs/controllers/SyncController.java
+++ b/src/main/java/noppes/npcs/controllers/SyncController.java
@@ -86,7 +86,7 @@ public class SyncController {
 
 		PlayerData data = PlayerData.get(player);
         if(data != null){
-            NoppesUtilServer.sendPlayerDataCompound(player, data.getNBT(), false);
+            NoppesUtilServer.sendPlayerDataCompound(player, data.getSyncNBTFull(), false);
         }
 	}
 
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
index d7b3133b3..09875af6d 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
@@ -117,35 +117,35 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
 		}
 		isGUIOpen = data.getBoolean("isGUIOpen");
 	}
-	public NBTTagCompound getNBT() {
-		if(player != null){
-			playername = player.getCommandSenderName();
-			uuid = player.getPersistentID().toString();
-		}
-		NBTTagCompound compound = new NBTTagCompound();
-		dialogData.saveNBTData(compound);
-		bankData.saveNBTData(compound);
-		questData.saveNBTData(compound);
-		transportData.saveNBTData(compound);
-		factionData.saveNBTData(compound);
-		itemgiverData.saveNBTData(compound);
-		mailData.saveNBTData(compound);
-		timers.writeToNBT(compound);
-		skinOverlays.writeToNBT(compound);
-		animationData.writeToNBT(compound);
+    public NBTTagCompound getNBT() {
+        if(player != null){
+            playername = player.getCommandSenderName();
+            uuid = player.getPersistentID().toString();
+        }
+        NBTTagCompound compound = new NBTTagCompound();
+        dialogData.saveNBTData(compound);
+        bankData.saveNBTData(compound);
+        questData.saveNBTData(compound);
+        transportData.saveNBTData(compound);
+        factionData.saveNBTData(compound);
+        itemgiverData.saveNBTData(compound);
+        mailData.saveNBTData(compound);
+        timers.writeToNBT(compound);
+        skinOverlays.writeToNBT(compound);
+        animationData.writeToNBT(compound);
 
-		compound.setString("PlayerName", playername);
-		compound.setString("UUID", uuid);
-		compound.setInteger("PlayerCompanionId", companionID);
-		compound.setBoolean("isGUIOpen",isGUIOpen);
+        compound.setString("PlayerName", playername);
+        compound.setString("UUID", uuid);
+        compound.setInteger("PlayerCompanionId", companionID);
+        compound.setBoolean("isGUIOpen",isGUIOpen);
 
-		if(hasCompanion()){
-			NBTTagCompound nbt = new NBTTagCompound();
-			if(activeCompanion.writeToNBTOptional(nbt))
-				compound.setTag("PlayerCompanion", nbt);
-		}
-		return compound;
-	}
+        if(hasCompanion()){
+            NBTTagCompound nbt = new NBTTagCompound();
+            if(activeCompanion.writeToNBTOptional(nbt))
+                compound.setTag("PlayerCompanion", nbt);
+        }
+        return compound;
+    }
 
     public NBTTagCompound getSyncNBT(){
         NBTTagCompound compound = new NBTTagCompound();
@@ -162,6 +162,40 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
         factionData.loadNBTData(data);
     }
 
+    public NBTTagCompound getSyncNBTFull() {
+        if(player != null){
+            playername = player.getCommandSenderName();
+            uuid = player.getPersistentID().toString();
+        }
+        NBTTagCompound compound = new NBTTagCompound();
+        dialogData.saveNBTData(compound);
+        bankData.saveNBTData(compound);
+        questData.saveNBTData(compound);
+        transportData.saveNBTData(compound);
+        factionData.saveNBTData(compound);
+        mailData.saveNBTData(compound);
+        compound.setString("PlayerName", playername);
+        compound.setString("UUID", uuid);
+        return compound;
+    }
+
+    public void setSyncNBTFull(NBTTagCompound data){
+        dialogData.loadNBTData(data);
+        bankData.loadNBTData(data);
+        questData.loadNBTData(data);
+        transportData.loadNBTData(data);
+        factionData.loadNBTData(data);
+        mailData.loadNBTData(data);
+        if(player != null){
+            playername = player.getCommandSenderName();
+            uuid = player.getPersistentID().toString();
+        }
+        else{
+            playername = data.getString("PlayerName");
+            uuid = data.getString("UUID");
+        }
+    }
+
 	@Override
 	public void init(Entity entity, World world) {