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

OnHealOtherPlayer now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 14:31:39 -07:00
parent c6c4446021
commit f0a6ad54a2
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
TShockAPI/GetDataHandlers.cs
View file

@ -605,11 +605,8 @@ namespace TShockAPI
} }
/// <summary>The event args object for the HealOtherPlayer event</summary> /// <summary>The event args object for the HealOtherPlayer event</summary>
public class HealOtherPlayerEventArgs : HandledEventArgs public class HealOtherPlayerEventArgs : GetDataHandledEventArgs
{ {
/// <summary>The TSPlayer object that caused the event</summary>
public TSPlayer Player { get; set; }
/// <summary>The Terraria player index of the target player</summary> /// <summary>The Terraria player index of the target player</summary>
public byte TargetPlayerIndex { get; set; } public byte TargetPlayerIndex { get; set; }
@ -621,11 +618,10 @@ namespace TShockAPI
public static HandlerList<HealOtherPlayerEventArgs> HealOtherPlayer = new HandlerList<HealOtherPlayerEventArgs>(); public static HandlerList<HealOtherPlayerEventArgs> HealOtherPlayer = new HandlerList<HealOtherPlayerEventArgs>();
/// <summary>Fires the HealOtherPlayer event</summary> /// <summary>Fires the HealOtherPlayer event</summary>
/// <param name="player">The TSPlayer that started the event</param>
/// <param name="targetPlayerIndex">The Terraria player index that the event targets</param> /// <param name="targetPlayerIndex">The Terraria player index that the event targets</param>
/// <param name="amount">The amount to heal</param> /// <param name="amount">The amount to heal</param>
/// <returns>bool</returns> /// <returns>bool</returns>
private static bool OnHealOtherPlayer(TSPlayer player, byte targetPlayerIndex, short amount) private static bool OnHealOtherPlayer(TSPlayer player, MemoryStream data, byte targetPlayerIndex, short amount)
{ {
if (HealOtherPlayer == null) if (HealOtherPlayer == null)
return false; return false;
@ -633,6 +629,7 @@ namespace TShockAPI
var args = new HealOtherPlayerEventArgs var args = new HealOtherPlayerEventArgs
{ {
Player = player, Player = player,
Data = data,
TargetPlayerIndex = targetPlayerIndex, TargetPlayerIndex = targetPlayerIndex,
Amount = amount, Amount = amount,
}; };
@ -1586,7 +1583,7 @@ namespace TShockAPI
byte plr = args.Data.ReadInt8(); byte plr = args.Data.ReadInt8();
short amount = args.Data.ReadInt16(); short amount = args.Data.ReadInt16();
if (OnHealOtherPlayer(args.Player, plr, amount)) if (OnHealOtherPlayer(args.Player, args.Data, plr, amount))
return true; return true;
return false; return false;