Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite ssc #1982

Draft
wants to merge 5 commits into
base: general-devel
Choose a base branch
from
Draft

Rewrite ssc #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f7fe66
Create a bunch of new SSC classes
QuiCM Jun 3, 2020
a24b88d
CRUDify the SSC character manager
QuiCM Jun 3, 2020
7f1a5aa
Working implementation
QuiCM Jun 3, 2020
02db739
Enable stack hack detection again
QuiCM Jun 3, 2020
a8532ca
Remove an incorrect comment
QuiCM Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 7 additions & 51 deletions TShockAPI/Commands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,25 +817,13 @@ private static void AttemptLogin(CommandArgs args)
(usingUUID && account.UUID == args.Player.UUID && !TShock.Config.DisableUUIDLogin &&
!String.IsNullOrWhiteSpace(args.Player.UUID)))
{
args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, account.ID);

var group = TShock.Groups.GetGroupByName(account.Group);

args.Player.Group = group;
args.Player.tempGroup = null;
args.Player.Account = account;
args.Player.IsLoggedIn = true;
args.Player.IsDisabledForSSC = false;

if (Main.ServerSideCharacter)
{
if (args.Player.HasPermission(Permissions.bypassssc))
{
args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player);
}
args.Player.PlayerData.RestoreCharacter(args.Player);
}
args.Player.LoginFailsBySsi = false;

if (args.Player.HasPermission(Permissions.ignorestackhackdetection))
Expand Down Expand Up @@ -1612,14 +1600,8 @@ private static void SaveSSC(CommandArgs args)
{
if (Main.ServerSideCharacter)
{
ServerSideCharacters.ServerSideCoordinator.SaveAllPlayersData();
args.Player.SendSuccessMessage("SSC has been saved.");
foreach (TSPlayer player in TShock.Players)
{
if (player != null && player.IsLoggedIn && !player.IsDisabledPendingTrashRemoval)
{
TShock.CharacterDB.InsertPlayerData(player, true);
}
}
}
}

Expand Down Expand Up @@ -1650,23 +1632,13 @@ private static void OverrideSSC(CommandArgs args)
}

TSPlayer matchedPlayer = matchedPlayers[0];
if (matchedPlayer.IsLoggedIn)
{
args.Player.SendErrorMessage("Player \"{0}\" is already logged in.", matchedPlayer.Name);
return;
}
if (!matchedPlayer.LoginFailsBySsi)
{
args.Player.SendErrorMessage("Player \"{0}\" has to perform a /login attempt first.", matchedPlayer.Name);
return;
}
if (matchedPlayer.IsDisabledPendingTrashRemoval)
{
args.Player.SendErrorMessage("Player \"{0}\" has to reconnect first.", matchedPlayer.Name);
return;
}

TShock.CharacterDB.InsertPlayerData(matchedPlayer);
ServerSideCharacters.ServerSideCoordinator.ApplyServerSidePlayerData(matchedPlayer, temporaryData: matchedPlayer.SscDataWhenJoined);
args.Player.SendSuccessMessage("SSC of player \"{0}\" has been overriden.", matchedPlayer.Name);
}

Expand Down Expand Up @@ -1710,16 +1682,9 @@ private static void UploadJoinData(CommandArgs args)

if (targetPlayer.IsLoggedIn)
{
if (TShock.CharacterDB.InsertSpecificPlayerData(targetPlayer, targetPlayer.DataWhenJoined))
{
targetPlayer.DataWhenJoined.RestoreCharacter(targetPlayer);
targetPlayer.SendSuccessMessage("Your local character data has been uploaded to the server.");
args.Player.SendSuccessMessage("The player's character data was successfully uploaded.");
}
else
{
args.Player.SendErrorMessage("Failed to upload your character data, are you logged in to an account?");
}
TShock.CharacterDB.UpdatePlayerData(targetPlayer.SscDataWhenJoined, targetPlayer.Account.ID);
targetPlayer.SendSuccessMessage("Your local character data has been uploaded to the server.");
args.Player.SendSuccessMessage("The player's character data was successfully uploaded.");
}
else
{
Expand Down Expand Up @@ -1864,13 +1829,7 @@ private static void Off(CommandArgs args)

if (Main.ServerSideCharacter)
{
foreach (TSPlayer player in TShock.Players)
{
if (player != null && player.IsLoggedIn && !player.IsDisabledPendingTrashRemoval)
{
player.SaveServerCharacter();
}
}
ServerSideCharacters.ServerSideCoordinator.SaveAllPlayersData();
}

string reason = ((args.Parameters.Count > 0) ? "Server shutting down: " + String.Join(" ", args.Parameters) : "Server shutting down!");
Expand Down Expand Up @@ -4133,10 +4092,7 @@ private static void ServerPassword(CommandArgs args)
private static void Save(CommandArgs args)
{
SaveManager.Instance.SaveWorld(false);
foreach (TSPlayer tsply in TShock.Players.Where(tsply => tsply != null))
{
tsply.SaveServerCharacter();
}
ServerSideCharacters.ServerSideCoordinator.SaveAllPlayersData();
}

private static void Settle(CommandArgs args)
Expand Down
Loading