diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java
index e65f46567..b9e4570e6 100644
--- a/src/main/java/noppes/npcs/ServerEventsHandler.java
+++ b/src/main/java/noppes/npcs/ServerEventsHandler.java
@@ -360,13 +360,10 @@ public class ServerEventsHandler {
 		questData.checkQuestCompletion(playerData, EnumQuestType.Item);
 	}
 
-	@SubscribeEvent(priority = EventPriority.HIGHEST)
-	public void onEntityConstructing(EntityEvent.EntityConstructing event) {
-		if (event.entity instanceof EntityPlayerMP) {
-			PlayerData data = new PlayerData();
-			data.player = (EntityPlayer) event.entity;
-			event.entity.registerExtendedProperties("CustomNpcsData", data);
-		}
+	@SubscribeEvent
+	public void world(PlayerEvent.SaveToFile event){
+		PlayerData data = PlayerDataController.instance.getPlayerData((EntityPlayer) event.entity);
+		data.save();
 	}
 
 	@SubscribeEvent
diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
index 80f9c9666..ba9deab99 100644
--- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java
+++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java
@@ -51,12 +51,10 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
 
 	@Override
 	public void saveNBTData(NBTTagCompound nbtTagCompound) {
-		this.save();
 	}
 
 	@Override
 	public void loadNBTData(NBTTagCompound compound) {
-		this.load();
 	}
 
 	public void setNBT(NBTTagCompound data){