diff --git a/src/main/java/com/comandante/creeper/Items/ForageManager.java b/src/main/java/com/comandante/creeper/Items/ForageManager.java index 9846ae3845a29398bd2badfffcf09a54526aaebc..e7c1491859ace46a9b869c1c9cf4617e658f337b 100644 --- a/src/main/java/com/comandante/creeper/Items/ForageManager.java +++ b/src/main/java/com/comandante/creeper/Items/ForageManager.java @@ -6,6 +6,7 @@ import com.comandante.creeper.player.CoolDown; import com.comandante.creeper.player.CoolDownType; import com.comandante.creeper.player.Player; import com.comandante.creeper.server.Color; +import com.comandante.creeper.stat.Stats; import com.comandante.creeper.world.Area; import com.comandante.creeper.world.Room; import org.apache.log4j.Logger; @@ -44,7 +45,8 @@ public class ForageManager { gameManager.getChannelUtils().write(player.getPlayerId(), "You scan the ground for plants, herbs and fungi...\r\n"); long countOfForagesFound = 0; long totalForageXp = 0; - long foragingLevel = getLevel(gameManager.getPlayerManager().getPlayerMetadata(player.getPlayerId()).getStats().getForaging()); + Stats playerStatsWithEquipmentAndLevel = player.getPlayerStatsWithEquipmentAndLevel(); + long foragingLevel = playerStatsWithEquipmentAndLevel.getForaging(); try { for (Forage forage : room.getForages().values()) { if (forage.getMinLevel() > foragingLevel) { diff --git a/src/main/java/com/comandante/creeper/command/LookCommand.java b/src/main/java/com/comandante/creeper/command/LookCommand.java index a3d053f0ff69745c99aef3e6f458d11b083960eb..1a0062af9db8813e0b547cb4cce9b6b0448e7177 100644 --- a/src/main/java/com/comandante/creeper/command/LookCommand.java +++ b/src/main/java/com/comandante/creeper/command/LookCommand.java @@ -30,6 +30,9 @@ public class LookCommand extends Command { } originalMessageParts.remove(0); String target = Joiner.on(" ").join(originalMessageParts); + if (target.equalsIgnoreCase("self")) { + write(player.getLookString() + "\r\n"); + } //Notables for (Map.Entry<String, String> notable : currentRoom.getNotables().entrySet()) { if (notable.getKey().equalsIgnoreCase(target)) { diff --git a/src/main/java/com/comandante/creeper/command/WhoCommand.java b/src/main/java/com/comandante/creeper/command/WhoCommand.java index dd87272ea37861def8439e53ae543c7ca285bdf2..1358150fca1e0fee145e5fcd88de76494941eed6 100755 --- a/src/main/java/com/comandante/creeper/command/WhoCommand.java +++ b/src/main/java/com/comandante/creeper/command/WhoCommand.java @@ -35,7 +35,7 @@ public class WhoCommand extends Command { ShownBorders.NONE); t.setColumnWidth(0, 14, 24); t.setColumnWidth(1, 7, 7); - t.setColumnWidth(2, 15, 15); + t.setColumnWidth(2, 15, 20); t.addCell("Player"); t.addCell("Level"); t.addCell("XP"); diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java index 38b6960cef30f133228fdec4db0703ec53f211ea..d741a79567f5e93432082fea2b741e3af0ca6ed4 100755 --- a/src/main/java/com/comandante/creeper/player/Player.java +++ b/src/main/java/com/comandante/creeper/player/Player.java @@ -152,6 +152,9 @@ public class Player extends CreeperEntity { removeAllActiveFights(); } 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"); CoolDown death = new CoolDown(CoolDownType.DEATH); addCoolDown(death); gameManager.writeToPlayerCurrentRoom(getPlayerId(), getPlayerName() + " is now dead." + "\r\n");