diff --git a/src/main/java/com/comandante/creeper/player/CoolDownType.java b/src/main/java/com/comandante/creeper/player/CoolDownType.java index e50fd8b214cec2de4b55ddf527bd415e602d29e1..1e1d98d34e673b7a25a00896434258c7f373595b 100644 --- a/src/main/java/com/comandante/creeper/player/CoolDownType.java +++ b/src/main/java/com/comandante/creeper/player/CoolDownType.java @@ -3,7 +3,7 @@ package com.comandante.creeper.player; public enum CoolDownType { - DEATH("death", 30), + DEATH("death", 150), FORAGE_LONG("forage-long", 7), FORAGE_MEDIUM("forage-medium", 4), FORAGE_SHORT("forage-short", 3), @@ -11,7 +11,6 @@ public enum CoolDownType { SPELL("",0), NPC_FIGHT("fight",30), NPC_ROAM("npc-roam", 600); - private final String name; private final int ticks; diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java index bef84a816b3c73ea4f2e6e6c5ca181a66dbdd740..4ed831d1e9de4311b904a64eeecd51f953a2f955 100755 --- a/src/main/java/com/comandante/creeper/player/Player.java +++ b/src/main/java/com/comandante/creeper/player/Player.java @@ -153,8 +153,10 @@ public class Player extends CreeperEntity { } if (!isActive(CoolDownType.DEATH)) { long newGold = getPlayerMetadata().getGold() / 2; - getPlayerMetadata().setGold(newGold); - gameManager.getChannelUtils().write(getPlayerId(), "You just " + Color.BOLD_ON + Color.RED + "lost " + Color.RESET + newGold + " gold!\r\n"); + PlayerMetadata playerMetadata = getPlayerMetadata(); + playerMetadata.setGold(newGold); + gameManager.getPlayerManager().savePlayerMetadata(playerMetadata); + gameManager.getChannelUtils().write(getPlayerId(), "You just " + Color.BOLD_ON + Color.RED + "lost " + Color.RESET + newGold + Color.YELLOW + " gold" + Color.RESET + "!\r\n"); CoolDown death = new CoolDown(CoolDownType.DEATH); addCoolDown(death); gameManager.writeToPlayerCurrentRoom(getPlayerId(), getPlayerName() + " is now dead." + "\r\n"); diff --git a/src/main/java/com/comandante/creeper/spells/Spell.java b/src/main/java/com/comandante/creeper/spells/Spell.java index 81f805c36709fa01530572d0016429f0b22c7821..b89c3acd7c13ad7595d16aee9013033673a88468 100644 --- a/src/main/java/com/comandante/creeper/spells/Spell.java +++ b/src/main/java/com/comandante/creeper/spells/Spell.java @@ -37,7 +37,17 @@ public abstract class Spell { private static final Logger log = Logger.getLogger(Spell.class); - public Spell(GameManager gameManager, Set<String> validTriggers, int manaCost, Stats attackStats, List<String> attackMessages, String spellDescription, String spellName, Set<Effect> effects, boolean isAreaSpell, SpellExecute spellExecute, int coolDownTicks) { + public Spell(GameManager gameManager, + Set<String> validTriggers, + int manaCost, + Stats attackStats, + List<String> attackMessages, + String spellDescription, + String spellName, + Set<Effect> effects, + boolean isAreaSpell, + SpellExecute spellExecute, + int coolDownTicks) { this.gameManager = gameManager; this.validTriggers = validTriggers; this.manaCost = manaCost;