From 72ccd34ae674ca83dc6481145619f0595a373b06 Mon Sep 17 00:00:00 2001 From: White Date: Tue, 14 Jun 2016 23:22:06 +0930 Subject: [PATCH] Fixes unwanted superadmin behaviour concerning SSC inventories. --- TShockAPI/Commands.cs | 3 +-- TShockAPI/GetDataHandlers.cs | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 9d454d21..2a518896 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -797,9 +797,8 @@ namespace TShockAPI { if (args.Player.HasPermission(Permissions.bypassssc)) { - args.Player.IgnoreActionsForClearingTrashCan = false; + args.Player.PlayerData.RestoreCharacter(args.Player); } - args.Player.PlayerData.RestoreCharacter(args.Player); } args.Player.LoginFailsBySsi = false; diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 72c3e9a1..d976fbd3 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1477,7 +1477,7 @@ namespace TShockAPI if (Main.ServerSideCharacter) { - if (!args.Player.HasPermission(Permissions.bypassssc)) + if (args.Player.HasPermission(Permissions.bypassssc)) { args.Player.PlayerData.RestoreCharacter(args.Player); } @@ -1554,9 +1554,8 @@ namespace TShockAPI { if (args.Player.HasPermission(Permissions.bypassssc)) { - args.Player.IgnoreActionsForClearingTrashCan = false; + args.Player.PlayerData.RestoreCharacter(args.Player); } - args.Player.PlayerData.RestoreCharacter(args.Player); } args.Player.LoginFailsBySsi = false;