EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 03:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Fixed a bug where Kraken messages couldn't be disabled.

Browse Source 
Fixes #1174
This commit is contained in:
GJ
2013-09-12 15:53:43 -04:00
parent a49d373af0
commit de42063171
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java
View File

@ -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();