Reputation and quests can sometimes be lost #103

ToroCraft · Feb 1, 2017 · e35dc81 · e35dc81
1 parent a687e02
commit e35dc81
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/java/net/torocraft/toroquest/civilization/CivilizationHandlers.java b/java/net/torocraft/toroquest/civilization/CivilizationHandlers.java
@@ -70,6 +70,10 @@ public void handleEnterProvince(CivilizationEvent.Enter event) {
 	public void handleLeaveProvince(CivilizationEvent.Leave event) {
 
 	}
+
+	/*
+	 * -1360 40 342
+	 */
 
 	@SubscribeEvent
 	public void onDeath(PlayerEvent.Clone event) {
@@ -80,9 +84,15 @@ public void onDeath(PlayerEvent.Clone event) {
 		PlayerCivilizationCapability newCap = PlayerCivilizationCapabilityImpl.get(event.getEntityPlayer());
 		PlayerCivilizationCapability originalCap = PlayerCivilizationCapabilityImpl.get(event.getOriginal());
 
-		if (newCap == null || originalCap == null) {
+		if (originalCap == null) {
 			return;
 		}
+
+		if(newCap == null){
+			throw new NullPointerException("missing player capability during clone");
+		}
+
+		//System.out.println("CLONE: " + originalCap.writeNBT());
 
 		newCap.readNBT(originalCap.writeNBT());
 	}
@@ -99,8 +109,10 @@ public void onSave(PlayerEvent.SaveToFile event) {
 
 		NBTTagCompound civData = cap.writeNBT();
 
-		if (civData == null || civData.getTag("reputations") == null || ((NBTTagList) civData.getTag("reputations")).tagCount() < 1) {
-			System.out.println("Not writing empty ToroQuest data for player " + event.getEntityPlayer().getName());
+		//System.out.println("SAVE: " + civData);
+
+ 		if (civData == null || civData.getTag("reputations") == null || ((NBTTagList) civData.getTag("reputations")).tagCount() < 1) {
+			//System.out.println("******************Not writing empty ToroQuest data for player " + event.getEntityPlayer().getName());
 			return;
 		}
 
@@ -117,7 +129,16 @@ public void onLoad(PlayerEvent.LoadFromFile event) {
 		if (cap == null) {
 			return;
 		}
-		cap.readNBT((NBTTagCompound) event.getEntityPlayer().getEntityData().getTag(ToroQuest.MODID + ".playerCivilization"));
+
+		NBTTagCompound c = event.getEntityPlayer().getEntityData().getCompoundTag(ToroQuest.MODID + ".playerCivilization");
+
+		if(c == null){
+			//System.out.println("******************Missing civ data on load");
+		}else{
+			System.out.println("LOAD: " + c.toString());
+		}
+
+		cap.readNBT(c);
 	}
 
 	@SubscribeEvent