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

Add permission to ignore max HP/MP, add config option for max HP/MP, possibly fix SSC

Browse source 
Fixing SSC is done by sending packet 39 (item disown) to the client.
Until a response, which is packet 22, is received from the client, all
SSC-related packets are completely ignored. This ensures that the SSC
data which is sent is not dirtied due to packets which are processed
during RestoreCharacter or slightly afterwards.
This commit is contained in:
MarioE 2014-07-28 23:40:27 -04:00
parent 7a8422de5c
commit fd5c696656
5 changed files with 56 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/ConfigFile.cs
View file

@ -382,6 +382,12 @@ namespace TShockAPI
[Description("Whether bosses or invasions should be anonymously spawned.")]
public bool AnonymousBossInvasions = true;
[Description("The maximum allowable HP, before equipment buffs.")]
public int MaxHP = 500;
[Description("The maximum allowable MP, before equipment buffs.")]
public int MaxMP = 200;
/// <summary>
/// Reads a configuration file from a given path
/// </summary>

60
TShockAPI/GetDataHandlers.cs
View file

@ -1229,6 +1229,7 @@ namespace TShockAPI
{ PacketTypes.UpdateNPCHome, UpdateNPCHome },
{ PacketTypes.PlayerAddBuff, HandlePlayerAddBuff },
{ PacketTypes.ItemDrop, HandleItemDrop },
{ PacketTypes.ItemOwner, HandleItemOwner },
{ PacketTypes.PlayerHp, HandlePlayerHp },
{ PacketTypes.PlayerMana, HandlePlayerMana },
{ PacketTypes.PlayerDamage, HandlePlayerDamage },
@ -1283,19 +1284,9 @@ namespace TShockAPI
bypassTrashCanCheck = true;
}
if (OnPlayerSlot(plr, slot, stack, prefix, type))
if (OnPlayerSlot(plr, slot, stack, prefix, type) || plr != args.Player.Index || slot < 0 || slot > NetItem.maxNetInventory || args.Player.IgnoreSSCPackets)
return true;
if (plr != args.Player.Index)
{
return true;
}
if (slot < 0 || slot > NetItem.maxNetInventory)
{
return true;
}
// Garabage? Or will it cause some internal initialization or whatever?
var item = new Item();
item.netDefaults(type);
@ -1305,10 +1296,9 @@ namespace TShockAPI
{
args.Player.PlayerData.StoreSlot(slot, type, prefix, stack);
}
else if (
Main.ServerSideCharacter && TShock.Config.DisableLoginBeforeJoin && !bypassTrashCanCheck &&
args.Player.HasSentInventory && !args.Player.Group.HasPermission(Permissions.bypassssc)
) {
else if (Main.ServerSideCharacter && TShock.Config.DisableLoginBeforeJoin && !bypassTrashCanCheck &&
args.Player.HasSentInventory && !args.Player.Group.HasPermission(Permissions.bypassssc))
{
// The player might have moved an item to their trash can before they performed a single login attempt yet.
args.Player.IgnoreActionsForClearingTrashCan = true;
}
@ -1328,16 +1318,12 @@ namespace TShockAPI
var cur = args.Data.ReadInt16();
var max = args.Data.ReadInt16();
if (OnPlayerHP(plr, cur, max) || cur <= 0)
if (OnPlayerHP(plr, cur, max) || cur <= 0 || max <= 0 || args.Player.IgnoreSSCPackets)
return true;
if (args.Player.FirstMaxHP == 0)
args.Player.FirstMaxHP = max;
if (cur < 0 || cur > 600 || max < 100 || max > 600) //Abnormal values have the potential to cause infinite loops in the server.
if ((max > TShock.Config.MaxHP || cur > max) && !args.Player.Group.HasPermission(Permissions.ignorehp))
{
TShock.Utils.ForceKick(args.Player, "Crash Exploit Attempt", true);
Log.ConsoleError("HP Exploit Attempt: Current HP {0}, Max HP {0}", cur, max);
args.Player.Disable("Maximum HP beyond limit");
return true;
}
@ -1350,9 +1336,8 @@ namespace TShockAPI
if (args.Player.GodMode && (cur < max))
{
args.Player.Heal(args.TPlayer.statLifeMax);
args.Player.Heal(args.TPlayer.statLifeMax2);
}
return false;
}
@ -1362,11 +1347,14 @@ namespace TShockAPI
var cur = args.Data.ReadInt16();
var max = args.Data.ReadInt16();
if (OnPlayerMana(plr, cur, max))
if (OnPlayerMana(plr, cur, max) || cur < 0 || max < 0 || args.Player.IgnoreSSCPackets)
return true;
if (args.Player.FirstMaxMP == 0)
args.Player.FirstMaxMP = max;
if ((max > TShock.Config.MaxMP || cur > max) && !args.Player.Group.HasPermission(Permissions.ignoremp))
{
args.Player.Disable("Maximum MP beyond limit");
return true;
}
if (args.Player.IsLoggedIn)
{
@ -1374,7 +1362,6 @@ namespace TShockAPI
args.Player.TPlayer.statManaMax = max;
args.Player.PlayerData.maxMana = max;
}
return false;
}
@ -3126,6 +3113,23 @@ namespace TShockAPI
return false;
}
private static bool HandleItemOwner(GetDataHandlerArgs args)
{
var id = args.Data.ReadInt16();
var owner = args.Data.ReadInt8();
if (id < 0 || id > 400)
return true;
if (id == 400 && owner == 255)
{
args.Player.IgnoreSSCPackets = false;
return true;
}
return false;
}
private static bool HandlePlayerDamage(GetDataHandlerArgs args)
{
var id = args.Data.ReadInt8();

6
TShockAPI/Permissions.cs
View file

@ -154,6 +154,12 @@ namespace TShockAPI
[Description("Allow dropping banned items without the item being eaten.")]
public static readonly string allowdroppingbanneditems = "tshock.ignore.dropbanneditem";
[Description("Prevents you from being disabled by abnormal HP.")]
public static readonly string ignorehp = "tshock.ignore.hp";
[Description("Prevents you from being disabled by abnormal MP.")]
public static readonly string ignoremp = "tshock.ignore.mp";
// tshock.item nodes
[Description("User can spawn items.")]

18
TShockAPI/TSPlayer.cs
View file

@ -69,17 +69,20 @@ namespace TShockAPI
/// A timer to keep track of whether or not the player has recently thrown an explosive
/// </summary>
public int RecentFuse = 0;
/// <summary>
/// Whether to ignore packets that are SSC-relevant.
/// </summary>
public bool IgnoreSSCPackets { get; set; }
/// <summary>
/// A system to delay Remembered Position Teleports a few seconds
/// </summary>
public int RPPending = 0;
public int sX = -1;
public int sY = -1;
/// <summary>
/// A queue of tiles destroyed by the player for reverting.
/// </summary>
@ -90,10 +93,6 @@ namespace TShockAPI
/// </summary>
public Dictionary<Vector2, Tile> TilesCreated { get; protected set; }
public int FirstMaxHP { get; set; }
public int FirstMaxMP { get; set; }
/// <summary>
/// The player's group.
/// </summary>
@ -1300,6 +1299,9 @@ namespace TShockAPI
public void RestoreCharacter(TSPlayer player)
{
// Start ignoring SSC-related packets! This is critical so that we don't send or receive dirty data!
player.IgnoreSSCPackets = true;
player.TPlayer.statLife = this.health;
player.TPlayer.statLifeMax = this.maxHealth;
player.TPlayer.statMana = this.maxMana;
@ -1461,6 +1463,8 @@ namespace TShockAPI
NetMessage.SendData(50, -1, -1, "", player.Index, 0f, 0f, 0f, 0);
NetMessage.SendData(50, player.Index, -1, "", player.Index, 0f, 0f, 0f, 0);
NetMessage.SendData(76, -1, -1, "", player.Index);
NetMessage.SendData(39, player.Index, -1, "", 400);
}
}

2
TShockAPI/TShock.cs
View file

@ -1166,7 +1166,7 @@ namespace TShockAPI
}
if ((player.State < 10 || player.Dead) && (int) type > 12 && (int) type != 16 && (int) type != 42 && (int) type != 50 &&
(int) type != 38 && (int) type != 21)
(int) type != 38 && (int) type != 21 && (int) type != 22)
{
e.Handled = true;
return;