From 6825b2076a779f095dae4784eec03daa883ab530 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris.kearney@urbanairship.com>
Date: Sat, 23 Aug 2014 12:15:52 -0700
Subject: [PATCH] fixing who/whoami bug.
---
.../comandante/creeper/command/DefaultCommandHandler.java | 8 ++++----
.../comandante/creeper/command/commands/WhoCommand.java | 8 +++-----
.../creeper/command/commands/WhoamiCommand.java | 8 +++++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java b/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java
index 9569ca18..62758682 100644
--- a/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java
+++ b/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java
@@ -44,13 +44,13 @@ public class DefaultCommandHandler {
TellCommand tellCommand = new TellCommand(playerId, gameManager, originalMessage);
commandService.processCommand(tellCommand);
}
- else if (WhoamiCommand.validTriggers.contains(rootCommand)){
- WhoamiCommand whoamiCommand = new WhoamiCommand(playerId, gameManager, originalMessage);
- commandService.processCommand(whoamiCommand);
- }
else if (WhoCommand.validTriggers.contains(rootCommand)){
WhoCommand whoCommand = new WhoCommand(playerId, gameManager, originalMessage);
commandService.processCommand(whoCommand);
+ }
+ else if (WhoamiCommand.validTriggers.contains(rootCommand)){
+ WhoamiCommand whoamiCommand = new WhoamiCommand(playerId, gameManager, originalMessage);
+ commandService.processCommand(whoamiCommand);
} else {
UnknownCommand unknownCommand = new UnknownCommand(playerId, gameManager, originalMessage);
commandService.processCommand(unknownCommand);
diff --git a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java b/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
index c8222caf..d44a20aa 100644
--- a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
+++ b/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
@@ -1,14 +1,13 @@
package com.comandante.creeper.command.commands;
import com.comandante.creeper.managers.GameManager;
-import com.comandante.creeper.model.Player;
import com.google.common.collect.ImmutableList;
public class WhoCommand extends Command {
- private final static String helpDescription = "List players currently logged in to server.";
+ private final static String helpDescription = "List who you are.";
public final static ImmutableList validTriggers = new ImmutableList.Builder<String>().add(
- "whoami".toLowerCase()
+ "who".toLowerCase()
).build();
private final static boolean isCaseSensitiveTriggers = false;
@@ -18,7 +17,6 @@ public class WhoCommand extends Command {
@Override
public void run() {
- Player player = getGameManager().getPlayerManager().getPlayer(getPlayerId());
- player.getChannel().write(player.getPlayerName() + "\r\n");
+ getGameManager().who(getGameManager().getPlayerManager().getPlayer(getPlayerId()));
}
}
diff --git a/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java b/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
index 063c062a..2dd82b9b 100644
--- a/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
+++ b/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
@@ -1,13 +1,14 @@
package com.comandante.creeper.command.commands;
import com.comandante.creeper.managers.GameManager;
+import com.comandante.creeper.model.Player;
import com.google.common.collect.ImmutableList;
public class WhoamiCommand extends Command {
- private final static String helpDescription = "List who you are.";
+ private final static String helpDescription = "List players currently logged in to server.";
public final static ImmutableList validTriggers = new ImmutableList.Builder<String>().add(
- "who".toLowerCase()
+ "whoami".toLowerCase()
).build();
private final static boolean isCaseSensitiveTriggers = false;
@@ -17,6 +18,7 @@ public class WhoamiCommand extends Command {
@Override
public void run() {
-
+ Player player = getGameManager().getPlayerManager().getPlayer(getPlayerId());
+ player.getChannel().write(player.getPlayerName() + "\r\n");
}
}
--
GitLab