Fix op status for ~ and & users.

Dorus · Sep 21, 2014 · 6f0070e · 6f0070e
1 parent 995f299
commit 6f0070e
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/werewolf/Werewolf.java b/werewolf/Werewolf.java
@@ -539,10 +539,9 @@ private void joinGame(String sender) {
 					+ "the current game to finish before trying again.");
 			return;
 		}
-		// TODO: uncomment
-		// if (!isInChannel(sender)) {
-		// return;
-		// }
+		if (!isInChannel(sender)) {
+			return;
+		}
 		if (players2.isAdded(sender)) // has the player already joined?
 		{
 			sendNotice(sender, "You are already on the player list. Please wait for the next game to join again.");
@@ -761,7 +760,11 @@ protected boolean isSenderOp(String nick) // to check if the sender of a
 		User users[] = bot.getUsers(gameChan);
 
 		for (int i = 0; i < users.length; i++) {
-			if (users[i].getNick().equals(nick))
+			String nick2 = users[i].getNick();
+			if (nick2.equals("&" + nick) || nick2.equals("~" + nick)) {
+				return true;
+			}
+			if (nick2.equals(nick))
 				return users[i].isOp();
 		}
 		return false;
@@ -1079,7 +1082,8 @@ protected boolean isInChannel(String aName) {
 		User[] users = bot.getUsers(gameChan);
 
 		for (int i = 0; i < users.length; i++) {
-			if (users[i].getNick().equals(aName))
+			String nick = users[i].getNick();
+			if (aName.equals(nick) || aName.equals("&" + nick) || aName.equals("~" + nick))
 				return true;
 		}
 
@@ -1242,7 +1246,7 @@ public void timed() {
 			String rand;
 			do {
 				rand = users[((int) (Math.random() * users.length))].getNick();
-			} while (rand.equals(bot.getNick()));
+			} while (rand.equals(bot.getNick()) || rand.equals("~" + bot.getNick()) || rand.equals("&" + bot.getNick()));
 
 			String msg = getFromFile("BORED", rand, NOTICE);
 			if (msg != null)