Merge branch 'master' of github.com:Hetal728/MCGalaxy

This commit is contained in:
UnknownShadow200 2016-12-05 21:29:39 +11:00
commit 770d123b53
2 changed files with 2 additions and 1 deletions

View File

@ -31,6 +31,7 @@ namespace MCGalaxy.Commands {
public override void Use(Player p, string message) { public override void Use(Player p, string message) {
string[] parts = message.SplitSpaces(2); string[] parts = message.SplitSpaces(2);
if (message == "" || parts.Length == 1) { Help(p); return; } if (message == "" || parts.Length == 1) { Help(p); return; }
if (!MessageCmd.CanSpeak(p, name)) return;
string receiverName = PlayerInfo.FindMatchesPreferOnline(p, parts[0]); string receiverName = PlayerInfo.FindMatchesPreferOnline(p, parts[0]);
if (receiverName == null) return; if (receiverName == null) return;

View File

@ -83,7 +83,7 @@ namespace MCGalaxy {
string hashHex = BitConverter.ToString(hash); string hashHex = BitConverter.ToString(hash);
if (!mppass.CaselessEq(hashHex.Replace("-", ""))) { if (!mppass.CaselessEq(hashHex.Replace("-", ""))) {
if (!Player.IPInPrivateRange(p.ip)) { if (!Player.IPInPrivateRange(p.ip)) {
p.Leave(null, "Login failed! Try signing in again.", true); return false; p.Leave(null, "Login failed! Close the game and sign in again.", true); return false;
} }
} else { } else {
p.verifiedName = true; p.verifiedName = true;