Fix for previous commit

Tried to handle two syntaxes at the same time. Bad idea.
Handling the two different syntaxes separately.
This commit is contained in:
ORelio 2014-07-29 17:08:24 +02:00
parent e56d504067
commit 774043fddb

View file

@ -182,16 +182,28 @@ namespace MinecraftClient
//Detect Essentials (Bukkit) /m messages //Detect Essentials (Bukkit) /m messages
//[Someone -> me] message //[Someone -> me] message
//[Someone [rank] -> me] message //[~Someone -> me] message
else if (text[0] == '[' && tmp.Length > 3 && (tmp[1] == "->" || tmp[2] == "->") else if (text[0] == '[' && tmp.Length > 3 && tmp[1] == "->"
&& ((tmp[2] == "me]" || tmp[2] == "moi]") && (tmp[2] == "me]" || tmp[2] == "moi]")) //'me' is replaced by 'moi' in french servers
|| (tmp[3] == "me]" || tmp[3] == "moi]"))) //'me' is replaced by 'moi' in french servers
{ {
message = text.Substring(tmp[0].Length + 4 + tmp[2].Length + 1); message = text.Substring(tmp[0].Length + 4 + tmp[2].Length + 1);
sender = tmp[0].Substring(1); sender = tmp[0].Substring(1);
if (sender[0] == '~') { sender = sender.Substring(1); } if (sender[0] == '~') { sender = sender.Substring(1); }
return isValidName(sender); return isValidName(sender);
} }
//Detect Essentials (Bukkit) /me messages with some custom rank
//[Someone [rank] -> me] message
//[~Someone [rank] -> me] message
else if (text[0] == '[' && tmp.Length > 3 && tmp[2] == "->"
&& (tmp[3] == "me]" || tmp[3] == "moi]")) //'me' is replaced by 'moi' in french servers
{
message = text.Substring(tmp[0].Length + 1 + tmp[1].Length + 4 + tmp[2].Length + 1);
sender = tmp[0].Substring(1);
if (sender[0] == '~') { sender = sender.Substring(1); }
return isValidName(sender);
}
else return false; else return false;
} }
catch (IndexOutOfRangeException) { return false; } catch (IndexOutOfRangeException) { return false; }