themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #1228 from Patrikkk/fixing-ssc-4real

Browse source 
Fixing SSC for real
This commit is contained in:
Rodrigo 2016-06-27 23:24:31 +01:00 • committed by GitHub
commit 51e7b7de93
2 changed files with 27 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

21
TShockAPI/Commands.cs
View file

@ -793,12 +793,20 @@ namespace TShockAPI
var group = TShock.Utils.GetGroup(user.Group); var group = TShock.Utils.GetGroup(user.Group);
args.Player.Group = group;
args.Player.tempGroup = null;
args.Player.User = user;
args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none";
if (Main.ServerSideCharacter) if (Main.ServerSideCharacter)
{ {
if (args.Player.HasPermission(Permissions.bypassssc)) if (args.Player.HasPermission(Permissions.bypassssc))
{ {
args.Player.PlayerData.RestoreCharacter(args.Player); args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player);
} }
args.Player.PlayerData.RestoreCharacter(args.Player);
} }
args.Player.LoginFailsBySsi = false; args.Player.LoginFailsBySsi = false;
@ -808,17 +816,6 @@ namespace TShockAPI
if (args.Player.HasPermission(Permissions.usebanneditem)) if (args.Player.HasPermission(Permissions.usebanneditem))
args.Player.IgnoreActionsForDisabledArmor = "none"; args.Player.IgnoreActionsForDisabledArmor = "none";
args.Player.Group = group;
args.Player.tempGroup = null;
args.Player.User = user;
args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none";
if (!args.Player.IgnoreActionsForClearingTrashCan && Main.ServerSideCharacter)
{
args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player);
}
args.Player.SendSuccessMessage("Authenticated as " + user.Name + " successfully."); args.Player.SendSuccessMessage("Authenticated as " + user.Name + " successfully.");
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user: " + user.Name + "."); TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user: " + user.Name + ".");

41
TShockAPI/GetDataHandlers.cs
View file

@ -1476,12 +1476,20 @@ namespace TShockAPI
var group = TShock.Utils.GetGroup(user.Group); var group = TShock.Utils.GetGroup(user.Group);
args.Player.Group = group;
args.Player.tempGroup = null;
args.Player.User = user;
args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none";
if (Main.ServerSideCharacter) if (Main.ServerSideCharacter)
{ {
if (args.Player.HasPermission(Permissions.bypassssc)) if (args.Player.HasPermission(Permissions.bypassssc))
{ {
args.Player.PlayerData.RestoreCharacter(args.Player); args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player);
} }
args.Player.PlayerData.RestoreCharacter(args.Player);
} }
args.Player.LoginFailsBySsi = false; args.Player.LoginFailsBySsi = false;
@ -1491,17 +1499,6 @@ namespace TShockAPI
if (args.Player.HasPermission(Permissions.usebanneditem)) if (args.Player.HasPermission(Permissions.usebanneditem))
args.Player.IgnoreActionsForDisabledArmor = "none"; args.Player.IgnoreActionsForDisabledArmor = "none";
args.Player.Group = group;
args.Player.tempGroup = null;
args.Player.User = user;
args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none";
if (!args.Player.IgnoreActionsForClearingTrashCan && Main.ServerSideCharacter)
{
args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player);
}
args.Player.SendSuccessMessage("Authenticated as " + user.Name + " successfully."); args.Player.SendSuccessMessage("Authenticated as " + user.Name + " successfully.");
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + "."); TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + ".");
Hooks.PlayerHooks.OnPlayerPostLogin(args.Player); Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
@ -1551,12 +1548,20 @@ namespace TShockAPI
var group = TShock.Utils.GetGroup(user.Group); var group = TShock.Utils.GetGroup(user.Group);
args.Player.Group = group;
args.Player.tempGroup = null;
args.Player.User = user;
args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none";
if (Main.ServerSideCharacter) if (Main.ServerSideCharacter)
{ {
if (args.Player.HasPermission(Permissions.bypassssc)) if (args.Player.HasPermission(Permissions.bypassssc))
{ {
args.Player.PlayerData.RestoreCharacter(args.Player); args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player);
} }
args.Player.PlayerData.RestoreCharacter(args.Player);
} }
args.Player.LoginFailsBySsi = false; args.Player.LoginFailsBySsi = false;
@ -1566,17 +1571,7 @@ namespace TShockAPI
if (args.Player.HasPermission(Permissions.usebanneditem)) if (args.Player.HasPermission(Permissions.usebanneditem))
args.Player.IgnoreActionsForDisabledArmor = "none"; args.Player.IgnoreActionsForDisabledArmor = "none";
args.Player.Group = group;
args.Player.tempGroup = null;
args.Player.User = user;
args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none";
if (!args.Player.IgnoreActionsForClearingTrashCan && Main.ServerSideCharacter)
{
args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player);
}
args.Player.SendMessage("Authenticated as " + args.Player.Name + " successfully.", Color.LimeGreen); args.Player.SendMessage("Authenticated as " + args.Player.Name + " successfully.", Color.LimeGreen);
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + "."); TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + ".");
TShock.Users.SetUserUUID(user, args.Player.UUID); TShock.Users.SetUserUUID(user, args.Player.UUID);