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

OnPlayerDamage now uses GetDataHandledEventArgs.

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 15:23:26 -07:00
parent d0efdc3939
commit 45c81e960a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/GetDataHandlers.cs
View file

@ -1162,9 +1162,8 @@ namespace TShockAPI
/// <summary> /// <summary>
/// For use in a PlayerDamage event /// For use in a PlayerDamage event
/// </summary> /// </summary>
public class PlayerDamageEventArgs : HandledEventArgs public class PlayerDamageEventArgs : GetDataHandledEventArgs
{ {
public TSPlayer Player { get; set; }
/// <summary> /// <summary>
/// The Terraria playerID of the player /// The Terraria playerID of the player
/// </summary> /// </summary>
@ -1193,7 +1192,7 @@ namespace TShockAPI
/// </summary> /// </summary>
public static HandlerList<PlayerDamageEventArgs> PlayerDamage = new HandlerList<PlayerDamageEventArgs>(); public static HandlerList<PlayerDamageEventArgs> PlayerDamage = new HandlerList<PlayerDamageEventArgs>();
private static bool OnPlayerDamage(TSPlayer player, byte id, byte dir, short dmg, bool pvp, bool crit, PlayerDeathReason playerDeathReason) private static bool OnPlayerDamage(TSPlayer player, MemoryStream data, byte id, byte dir, short dmg, bool pvp, bool crit, PlayerDeathReason playerDeathReason)
{ {
if (PlayerDamage == null) if (PlayerDamage == null)
return false; return false;
@ -1201,6 +1200,7 @@ namespace TShockAPI
var args = new PlayerDamageEventArgs var args = new PlayerDamageEventArgs
{ {
Player = player, Player = player,
Data = data,
ID = id, ID = id,
Direction = dir, Direction = dir,
Damage = dmg, Damage = dmg,
@ -2692,7 +2692,7 @@ namespace TShockAPI
var crit = bits[0]; var crit = bits[0];
var pvp = bits[1]; var pvp = bits[1];
if (OnPlayerDamage(args.Player, id, direction, dmg, pvp, crit, playerDeathReason)) if (OnPlayerDamage(args.Player, args.Data, id, direction, dmg, pvp, crit, playerDeathReason))
return true; return true;
if (TShock.Players[id].GodMode) if (TShock.Players[id].GodMode)