Merge pull request #43 from ataranlen/1.76-dev

Other Fix to titles
ataranlen · Mar 2, 2016 · 935f7d1 · 935f7d1
2 parents ad90890 + 6623b29
commit 935f7d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/civcraft/bin/com/avrgaming/civcraft/threading/tasks/PlayerChunkNotifyAsyncTask.class b/civcraft/bin/com/avrgaming/civcraft/threading/tasks/PlayerChunkNotifyAsyncTask.class
diff --git a/civcraft/src/com/avrgaming/civcraft/threading/tasks/PlayerChunkNotifyAsyncTask.java b/civcraft/src/com/avrgaming/civcraft/threading/tasks/PlayerChunkNotifyAsyncTask.java
@@ -168,8 +168,8 @@ private void showPlotMoveMessage() {
 
 		// Leaving culture to the wild.
 		if (fromCc != null && toCc == null) {
-			subTitle += fromCc.getOnLeaveString();
-		} else	if (fromCc == null && toCc != null) {	// Leaving wild, entering culture.
+			title += fromCc.getOnLeaveString();
+		} else if (fromCc == null && toCc != null) {	// Leaving wild, entering culture.
 			title += toCc.getOnEnterString();
 			if (civilization != null) {
 				if (civilization == toCc.getCiv()) {
@@ -178,7 +178,7 @@ private void showPlotMoveMessage() {
 					subTitle += CivSettings.localize.localizedString("var_civ_border_relation",civilization.getDiplomacyManager().getRelation(toCc.getCiv()).toString());
 				}			}
 			onCultureEnter(toCc);
-		}else if (fromCc != null && toCc !=null && fromCc.getCiv() != toCc.getCiv()) {
+		} else if (fromCc != null && toCc !=null && fromCc.getCiv() != toCc.getCiv()) {
 			//Leaving one civ's culture, into another. 
 
 			title += fromCc.getOnLeaveString() +" | "+ toCc.getOnEnterString();