From de42063171b93a56e79911c82504b9bc54cde72b Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Thu, 12 Sep 2013 15:53:43 -0400
Subject: [PATCH] Fixed a bug where Kraken messages couldn't be disabled.

Fixes #1174
---
 .../com/gmail/nossr50/config/AdvancedConfig.java     |  8 ++++----
 .../nossr50/runnables/skills/KrakenAttackTask.java   | 12 ++++++++++--
 .../gmail/nossr50/skills/fishing/FishingManager.java |  7 ++++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
index 58ec348ca..b2f17aa5c 100644
--- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
@@ -1052,10 +1052,10 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getKrakenTriesBeforeRelease() { return config.getInt("Kraken.Tries_Before_Release", 50); }
     public double getKrakenHealth() { return config.getDouble("Kraken.Health", 50.0D); }
     public String getKrakenName() { return config.getString("Kraken.Name", "The Kraken"); }
-    public String getServerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Server", "(PLAYER) has unleashed the kraken!"); }
-    public String getPlayerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Player", "THE KRAKEN HAS BEEN UNLEASHED!"); }
-    public String getPlayerDefeatMessage() { return config.getString("Kraken.Defeated_Message.Killed", "You have slain the kraken!"); }
-    public String getPlayerEscapeMessage() { return config.getString("Kraken.Defeated_Message.Escape", "You have escaped from the kraken!"); }
+    public String getServerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Server", ""); }
+    public String getPlayerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Player", ""); }
+    public String getPlayerDefeatMessage() { return config.getString("Kraken.Defeated_Message.Killed", ""); }
+    public String getPlayerEscapeMessage() { return config.getString("Kraken.Defeated_Message.Escape", ""); }
     public int getKrakenAttackInterval() { return config.getInt("Kraken.Attack_Interval_Seconds", 1); }
     public double getKrakenAttackDamage() { return config.getDouble("Kraken.Attack_Damage", 1.0D); }
 }
diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java
index b8a3dcca7..e2927a313 100644
--- a/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java
@@ -15,6 +15,8 @@ public class KrakenAttackTask extends BukkitRunnable {
     private Player player;
     private Location location;
     private final boolean GLOBAL_SOUNDS = AdvancedConfig.getInstance().getKrakenGlobalSoundsEnabled();
+    private final String DEFEAT_MESSAGE = AdvancedConfig.getInstance().getPlayerDefeatMessage();
+    private final String ESCAPE_MESSAGE = AdvancedConfig.getInstance().getPlayerEscapeMessage();
 
     public KrakenAttackTask(Creature kraken, Player player) {
         this.kraken = kraken;
@@ -56,7 +58,10 @@ public class KrakenAttackTask extends BukkitRunnable {
         }
 
         if (!kraken.isValid()) {
-            player.sendMessage(AdvancedConfig.getInstance().getPlayerDefeatMessage());
+            if (!DEFEAT_MESSAGE.isEmpty()) {
+                player.sendMessage(DEFEAT_MESSAGE);
+            }
+
             player.resetPlayerWeather();
             cancel();
         }
@@ -65,7 +70,10 @@ public class KrakenAttackTask extends BukkitRunnable {
             Location location = player.getLocation();
 
             if (!location.getBlock().isLiquid() && AdvancedConfig.getInstance().getKrakenEscapeAllowed()) {
-                player.sendMessage(AdvancedConfig.getInstance().getPlayerEscapeMessage());
+                if (!ESCAPE_MESSAGE.isEmpty()) {
+                    player.sendMessage(AdvancedConfig.getInstance().getPlayerEscapeMessage());
+                }
+
                 kraken.remove();
                 player.resetPlayerWeather();
                 cancel();
diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
index 4348bbcd3..d135469f3 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -103,7 +103,12 @@ public class FishingManager extends SkillManager {
         world.strikeLightningEffect(location);
         world.strikeLightningEffect(location);
         world.strikeLightningEffect(location);
-        player.sendMessage(AdvancedConfig.getInstance().getPlayerUnleashMessage());
+
+        String unleashMessage = AdvancedConfig.getInstance().getPlayerUnleashMessage();
+
+        if (!unleashMessage.isEmpty()) {
+            player.sendMessage(unleashMessage);
+        }
 
         if (AdvancedConfig.getInstance().getKrakenGlobalSoundsEnabled()) {
             world.playSound(location, Sound.GHAST_SCREAM, Misc.GHAST_VOLUME, Misc.getGhastPitch());