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

This commit is contained in:
UnknownShadow200 2016-08-18 13:13:38 +10:00
commit 2fd6ea5123

View File

@ -36,19 +36,18 @@ namespace MCGalaxy {
truename = name; truename = name;
skinName = name; skinName = name;
lock (pendingLock) {
int altsCount = 0; int altsCount = 0;
lock (pendingLock) {
DateTime now = DateTime.UtcNow; DateTime now = DateTime.UtcNow;
foreach (PendingItem item in pendingNames) { foreach (PendingItem item in pendingNames) {
if (item.Name == truename && (now - item.Connected).TotalSeconds <= 60) if (item.Name == truename && (now - item.Connected).TotalSeconds <= 60)
altsCount++; altsCount++;
} }
pendingNames.Add(new PendingItem(name)); pendingNames.Add(new PendingItem(name));
}
if (altsCount > 0) { if (altsCount > 0) {
Leave("Already logged in!", true); return; Leave("Already logged in!", true); return;
} }
}
string verify = enc.GetString(packet, 66, 32).Trim(); string verify = enc.GetString(packet, 66, 32).Trim();
verifiedName = false; verifiedName = false;
@ -352,7 +351,7 @@ namespace MCGalaxy {
string version = appName.Substring(spaceIndex, appName.Length - spaceIndex); string version = appName.Substring(spaceIndex, appName.Length - spaceIndex);
Version ver; Version ver;
try { try {
ver = Version.Parse(version); ver = new Version(version);
} catch { } catch {
return; return;
} }