Merge remote-tracking branch 'origin/develop' into develop

src/commands/CommandBeansShow.java

@@ -14,6 +14,16 @@ public class CommandBeansShow extends Command
 	@Override
 	public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
 	{
-		res.Call(String.format(LocStrings.Stub("BeansShowDisplay"), user.GetBeans()));
+		if(input.mentions == null)
+			res.Call(String.format(LocStrings.Stub("BeansShowDisplay"), user.GetBeans()));
+		else
+		{
+			String mentionedBeans = ""; 
+			for(KittyUser mentioned:input.mentions)
+			{
+				mentionedBeans += mentioned.name + " has " + mentioned.GetBeans() + " ";
+			}
+			res.Call(String.format(LocStrings.Stub("BeansShowMentioned"), mentionedBeans));
+		}
 	}
 }

src/commands/CommandRoll.java

@@ -166,7 +166,7 @@ public class CommandRoll extends Command
 
 	private boolean hasPrecendence(char op1, char op2)
 	{
-		 if ((op1 == '*' || op1 == '/') && (op2 == '+' || op2 == '-')) 
+		 if ((op2 == '*' || op2 == '/') && (op1 == '+' || op1 == '-')) 
 	         return false;
 	     else
 	    	 if ((op2 == 'd') && (op1 == '+' || op1 == '-' || op1 == '*' || op1 == '/'))