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

OnPlayerHP now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 14:16:43 -07:00
parent d54af26916
commit dbadcc6db0
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/GetDataHandlers.cs
View file

@ -256,7 +256,7 @@ namespace TShockAPI
/// <summary> /// <summary>
/// For use in a PlayerHP event /// For use in a PlayerHP event
/// </summary> /// </summary>
public class PlayerHPEventArgs : HandledEventArgs public class PlayerHPEventArgs : GetDataHandledEventArgs
{ {
/// <summary> /// <summary>
/// The Terraria playerID of the player /// The Terraria playerID of the player
@ -276,13 +276,15 @@ namespace TShockAPI
/// </summary> /// </summary>
public static HandlerList<PlayerHPEventArgs> PlayerHP = new HandlerList<PlayerHPEventArgs>(); public static HandlerList<PlayerHPEventArgs> PlayerHP = new HandlerList<PlayerHPEventArgs>();
private static bool OnPlayerHP(byte _plr, short _cur, short _max) private static bool OnPlayerHP(TSPlayer player, MemoryStream data, byte _plr, short _cur, short _max)
{ {
if (PlayerHP == null) if (PlayerHP == null)
return false; return false;
var args = new PlayerHPEventArgs var args = new PlayerHPEventArgs
{ {
Player = player,
Data = data,
PlayerId = _plr, PlayerId = _plr,
Current = _cur, Current = _cur,
Max = _max, Max = _max,
@ -1645,7 +1647,7 @@ namespace TShockAPI
var cur = args.Data.ReadInt16(); var cur = args.Data.ReadInt16();
var max = args.Data.ReadInt16(); var max = args.Data.ReadInt16();
if (OnPlayerHP(plr, cur, max) || cur <= 0 || max <= 0 || args.Player.IgnoreSSCPackets) if (OnPlayerHP(args.Player, args.Data, plr, cur, max) || cur <= 0 || max <= 0 || args.Player.IgnoreSSCPackets)
return true; return true;
if (max > TShock.Config.MaxHP && !args.Player.HasPermission(Permissions.ignorehp)) if (max > TShock.Config.MaxHP && !args.Player.HasPermission(Permissions.ignorehp))