From 6623b29dd8b08e0426f9ce88f03def3c2eed05e9 Mon Sep 17 00:00:00 2001 From: Nathan Stoltenberg Date: Wed, 2 Mar 2016 10:52:31 -0600 Subject: [PATCH] Other Fix to titles --- .../tasks/PlayerChunkNotifyAsyncTask.class | Bin 9510 -> 9510 bytes .../tasks/PlayerChunkNotifyAsyncTask.java | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/civcraft/bin/com/avrgaming/civcraft/threading/tasks/PlayerChunkNotifyAsyncTask.class b/civcraft/bin/com/avrgaming/civcraft/threading/tasks/PlayerChunkNotifyAsyncTask.class index 75cb6603dd4f752284b496085254b2657727d27d..9139291e5bb3ca6f8ee8c0578f3f26decf78e6b9 100644 GIT binary patch delta 32 ocmZ4Hwajb7B3WUs9SrxkGbHJ5WB9R+p?DiZwH4Rqt+Ive0NOVUlK=n! delta 32 ocmZ4Hwajb7B3WVX9SrxkGbHJ5WB9R+p?DiZwH5c~t+Ive0NPayl>h($ diff --git a/civcraft/src/com/avrgaming/civcraft/threading/tasks/PlayerChunkNotifyAsyncTask.java b/civcraft/src/com/avrgaming/civcraft/threading/tasks/PlayerChunkNotifyAsyncTask.java index 6f5027e62..be4b0cb6c 100644 --- 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();