From 9f127c1d4546b9326acab6e335a9d5f4eafdacca Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Mon, 29 May 2017 09:40:40 -0700
Subject: [PATCH] can't attack yourself, yo.
---
.../comandante/creeper/command/commands/FightKillCommand.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/comandante/creeper/command/commands/FightKillCommand.java b/src/main/java/com/comandante/creeper/command/commands/FightKillCommand.java
index 30f59565..ae3cadce 100644
--- a/src/main/java/com/comandante/creeper/command/commands/FightKillCommand.java
+++ b/src/main/java/com/comandante/creeper/command/commands/FightKillCommand.java
@@ -58,7 +58,7 @@ public class FightKillCommand extends Command {
Optional<Player> targetedPlayerOptional = currentRoom.getPresentPlayers().stream().filter(player -> player.getPlayerName().equals(target)).findFirst();
if (targetedPlayerOptional.isPresent()) {
Player targetedPlayer = targetedPlayerOptional.get();
- if (player.addActiveFight(targetedPlayer)) {
+ if (!targetedPlayer.getPlayerId().equals(playerId) && player.addActiveFight(targetedPlayer)) {
writeToRoom(player.getPlayerName() + " has attacked a " + targetedPlayer.getPlayerName());
return;
}
--
GitLab