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

Ensure we only save SSC when SSC is enabled.

Browse source
This commit is contained in:
Zack Piispanen 2013-10-04 16:59:57 -04:00
parent 0ed25ebbfe
commit ef35ffe091
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Commands.cs
View file

@ -475,7 +475,7 @@ namespace TShockAPI
args.Player.IsLoggedIn = true; args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none"; args.Player.IgnoreActionsForInventory = "none";
if (!args.Player.IgnoreActionsForClearingTrashCan) if (!args.Player.IgnoreActionsForClearingTrashCan && TShock.Config.ServerSideCharacter)
{ {
args.Player.PlayerData.CopyCharacter(args.Player); args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player); TShock.CharacterDB.InsertPlayerData(args.Player);

4
TShockAPI/GetDataHandlers.cs
View file

@ -1443,7 +1443,7 @@ namespace TShockAPI
args.Player.IsLoggedIn = true; args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none"; args.Player.IgnoreActionsForInventory = "none";
if (!args.Player.IgnoreActionsForClearingTrashCan) if (!args.Player.IgnoreActionsForClearingTrashCan && TShock.Config.ServerSideCharacter)
{ {
args.Player.PlayerData.CopyCharacter(args.Player); args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player); TShock.CharacterDB.InsertPlayerData(args.Player);
@ -1521,7 +1521,7 @@ namespace TShockAPI
args.Player.IsLoggedIn = true; args.Player.IsLoggedIn = true;
args.Player.IgnoreActionsForInventory = "none"; args.Player.IgnoreActionsForInventory = "none";
if (!args.Player.IgnoreActionsForClearingTrashCan) if (!args.Player.IgnoreActionsForClearingTrashCan && TShock.Config.ServerSideCharacter)
{ {
args.Player.PlayerData.CopyCharacter(args.Player); args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player); TShock.CharacterDB.InsertPlayerData(args.Player);

10
TShockAPI/TSPlayer.cs
View file

@ -779,6 +779,7 @@ namespace TShockAPI
SendData(PacketTypes.PlayerTeam, "", Index); SendData(PacketTypes.PlayerTeam, "", Index);
} }
private DateTime LastDisableNotification = DateTime.UtcNow;
public virtual void Disable(string reason = "") public virtual void Disable(string reason = "")
{ {
LastThreat = DateTime.UtcNow; LastThreat = DateTime.UtcNow;
@ -786,8 +787,13 @@ namespace TShockAPI
SetBuff(32, 330, true); //Slow SetBuff(32, 330, true); //Slow
SetBuff(23, 330, true); //Cursed SetBuff(23, 330, true); //Cursed
if (!string.IsNullOrEmpty(reason)) if (!string.IsNullOrEmpty(reason))
Log.ConsoleInfo(string.Format("Player {0} has been disabled for {1}.", Name, reason)); {
if ((DateTime.UtcNow - LastDisableNotification).TotalMilliseconds > 5000)
{
Log.ConsoleInfo(string.Format("Player {0} has been disabled for {1}.", Name, reason));
LastDisableNotification = DateTime.UtcNow;
}
}
var trace = new StackTrace(); var trace = new StackTrace();
StackFrame frame = null; StackFrame frame = null;
frame = trace.GetFrame(1); frame = trace.GetFrame(1);

6
TShockAPI/TShock.cs
View file

@ -618,8 +618,8 @@ namespace TShockAPI
OnSecondUpdate(); OnSecondUpdate();
LastCheck = DateTime.UtcNow; LastCheck = DateTime.UtcNow;
} }
if ((DateTime.UtcNow - LastSave).TotalMinutes >= Config.ServerSideCharacterSave) if (TShock.Config.ServerSideCharacter && (DateTime.UtcNow - LastSave).TotalMinutes >= Config.ServerSideCharacterSave)
{ {
foreach (TSPlayer player in Players) foreach (TSPlayer player in Players)
{ {
@ -903,7 +903,7 @@ namespace TShockAPI
} }
Log.Info(string.Format("{0} disconnected.", tsplr.Name)); Log.Info(string.Format("{0} disconnected.", tsplr.Name));
if (tsplr.IsLoggedIn && !tsplr.IgnoreActionsForClearingTrashCan) if (tsplr.IsLoggedIn && !tsplr.IgnoreActionsForClearingTrashCan && TShock.Config.ServerSideCharacter)
{ {
tsplr.PlayerData.CopyCharacter(tsplr); tsplr.PlayerData.CopyCharacter(tsplr);
CharacterDB.InsertPlayerData(tsplr); CharacterDB.InsertPlayerData(tsplr);