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

-Fixed an exploit where players could sneak items through SSI when DisableLoginBeforeJoin was true.

Browse source 
-/overidessi will now actually work on players not logged in...
This commit is contained in:
CoderCow 2013-07-01 12:00:12 +02:00
parent d72c6e4d3c
commit 25e584efe3
3 changed files with 59 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

49
TShockAPI/Commands.cs
View file

@ -438,7 +438,6 @@ namespace TShockAPI
}
try
{
// TODO: Is this needed? It seems to be an unreachable case
if (user == null)
{
args.Player.SendErrorMessage("A user by that name does not exist.");
@ -457,11 +456,13 @@ namespace TShockAPI
}
else if (!TShock.CheckInventory(args.Player))
{
args.Player.LoginFailsBySsi = true;
args.Player.SendErrorMessage("Login failed. Please fix the above errors then /login again.");
args.Player.IgnoreActionsForClearingTrashCan = true;
return;
}
}
args.Player.LoginFailsBySsi = false;
if (group.HasPermission(Permissions.ignorestackhackdetection))
args.Player.IgnoreActionsForCheating = "none";
@ -1180,29 +1181,49 @@ namespace TShockAPI
public static void OverrideSSI( CommandArgs args )
{
if (!TShock.Config.ServerSideInventory)
{
args.Player.SendErrorMessage("Server Side Inventory is disabled.");
return;
}
if( args.Parameters.Count < 1 )
{
args.Player.SendErrorMessage("Correct usage: /overridessi(/ossi) <player name>");
args.Player.SendErrorMessage("Correct usage: /overridessi|/ossi <player name>");
return;
}
var players = TShock.Utils.FindPlayer(args.Parameters[0]);
if( players.Count < 1 )
string playerNameToMatch = string.Join(" ", args.Parameters);
var matchedPlayers = TShock.Utils.FindPlayer(playerNameToMatch);
if( matchedPlayers.Count < 1 )
{
args.Player.SendErrorMessage("No players match " + args.Parameters[0] + "!");
args.Player.SendErrorMessage("No players matched \"{0}\".", playerNameToMatch);
return;
}
else if( players.Count > 1 )
else if( matchedPlayers.Count > 1 )
{
args.Player.SendErrorMessage( players.Count + " players matched " + args.Parameters[0] + "!");
args.Player.SendErrorMessage("{0} players matched \"{1}\".", matchedPlayers.Count, playerNameToMatch);
return;
}
else if (TShock.Config.ServerSideInventory)
{
if( players[0] != null && players[0].IsLoggedIn && !players[0].IgnoreActionsForClearingTrashCan)
{
args.Player.SendSuccessMessage( players[0].Name + " has been exempted and updated.");
TShock.InventoryDB.InsertPlayerData(players[0]);
}
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.IgnoreActionsForClearingTrashCan)
{
args.Player.SendErrorMessage("Player \"{0}\" has to reconnect first.", matchedPlayer.Name);
return;
}
TShock.InventoryDB.InsertPlayerData(matchedPlayer);
args.Player.SendSuccessMessage("SSI of player \"{0}\" has been overriden.", matchedPlayer.Name);
}
private static void ForceXmas(CommandArgs args)