From b98fd234c6164446f967e9ad3842f74704b54e38 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Sun, 7 Aug 2016 16:05:01 -0700
Subject: [PATCH] migrated del command to new format, and reverted back to old
loot command which works fine
---
.../com/comandante/creeper/command/DelCommand.java | 14 +++-----------
.../comandante/creeper/command/LootCommand.java | 11 ++++++-----
.../comandante/creeper/player/NpcTestHarness.java | 2 +-
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/comandante/creeper/command/DelCommand.java b/src/main/java/com/comandante/creeper/command/DelCommand.java
index d25cc8ba..ce1c80f2 100644
--- a/src/main/java/com/comandante/creeper/command/DelCommand.java
+++ b/src/main/java/com/comandante/creeper/command/DelCommand.java
@@ -22,14 +22,8 @@ public class DelCommand extends Command {
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
- execCommand(ctx, e, new CommandRunnable() {
- @Override
- public void run() {
-
- }
- });
- try {
- if (originalMessageParts.size() <= 1) {
+ execCommand(ctx, e, () -> {
+ if (originalMessageParts.size() <= 1) {
write(returnAllSettings());
return;
}
@@ -37,9 +31,7 @@ public class DelCommand extends Command {
String desiredSettingName = originalMessageParts.get(0);
player.removePlayerSetting(desiredSettingName);
write("Setting removed.\r\n");
- } finally {
- super.messageReceived(ctx, e);
- }
+ });
}
private String returnAllSettings() {
diff --git a/src/main/java/com/comandante/creeper/command/LootCommand.java b/src/main/java/com/comandante/creeper/command/LootCommand.java
index 68ede92d..8695e66f 100644
--- a/src/main/java/com/comandante/creeper/command/LootCommand.java
+++ b/src/main/java/com/comandante/creeper/command/LootCommand.java
@@ -28,7 +28,7 @@ public class LootCommand extends Command {
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
execCommand(ctx, e, () -> {
if (originalMessageParts.size() > 1) {
- player.getInventory().forEach(item -> {
+ for (Item item : player.getInventory()) {
if (item.getItemTypeId() == Item.CORPSE_ID_RESERVED) {
Loot loot = item.getLoot();
if (loot != null) {
@@ -38,18 +38,19 @@ public class LootCommand extends Command {
player.incrementGold(gold);
}
Set<Item> items = lootManager.lootItemsReturn(loot);
- items.forEach(i -> {
+ for (Item i: items) {
gameManager.acquireItem(player, i.getItemId());
- write("You looted " + i.getItemName() + " from a " + item.getItemName() + ".\r\n");
- });
+ write("You looted " + i.getItemName() + " from a " + item.getItemName() + ".\r\n");
+ }
if (gold < 0 && items.size() == 0) {
write("You looted nothing from " + item.getItemName() + "\r\n");
}
}
player.removeInventoryId(item.getItemId());
entityManager.removeItem(item);
+ return;
}
- });
+ }
}
});
}
diff --git a/src/test/com/comandante/creeper/player/NpcTestHarness.java b/src/test/com/comandante/creeper/player/NpcTestHarness.java
index f682686a..0e251ede 100644
--- a/src/test/com/comandante/creeper/player/NpcTestHarness.java
+++ b/src/test/com/comandante/creeper/player/NpcTestHarness.java
@@ -71,7 +71,7 @@ public class NpcTestHarness {
int npcWins = 0;
totalFightRounds = 0;
- int totalIterations = 100000;
+ int totalIterations = 1000;
for (int i = 0; i < totalIterations; i++) {
String username = UUID.randomUUID().toString();
Player player = createRandomPlayer(username);
--
GitLab