From 5eade7c04240cc84a70427c1bb14b6375e9d16d4 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Sun, 14 Aug 2016 20:16:03 -0700
Subject: [PATCH] crucial check for a fight
---
.../java/com/comandante/creeper/command/BackCommand.java | 4 ++++
src/main/java/com/comandante/creeper/player/Player.java | 7 +------
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/comandante/creeper/command/BackCommand.java b/src/main/java/com/comandante/creeper/command/BackCommand.java
index e7fa4d66..c15120bd 100644
--- a/src/main/java/com/comandante/creeper/command/BackCommand.java
+++ b/src/main/java/com/comandante/creeper/command/BackCommand.java
@@ -22,6 +22,10 @@ public class BackCommand extends Command {
@Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
execCommand(ctx, e, () -> {
+ if (player.isActiveFights()) {
+ write("You can't move while in a fight!");
+ return;
+ }
Room returnRoom = player.getPreviousRoom();
player.removeActiveAlertStatus();
PlayerMovement playerMovement = new PlayerMovement(player, currentRoom.getRoomId(), returnRoom.getRoomId(), "fleed to where they came from.", "up");
diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index 2dcfb547..be4d5200 100644
--- a/src/main/java/com/comandante/creeper/player/Player.java
+++ b/src/main/java/com/comandante/creeper/player/Player.java
@@ -726,12 +726,7 @@ public class Player extends CreeperEntity {
inventoryItems.add(itemEntity);
}
}
- Collections.sort(inventoryItems, new Comparator<Item>() {
- @Override
- public int compare(final Item object1, final Item object2) {
- return object1.getItemName().compareTo(object2.getItemName());
- }
- });
+ Collections.sort(inventoryItems, (a, b) -> a.getItemName().compareTo(b.getItemName()));
return inventoryItems;
}
}
--
GitLab