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

OnPvpToggled now uses GetDataHandledEventArgs

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-23 14:12:41 -07:00
parent 301125b2d8
commit 62013c7594
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

@ -139,7 +139,7 @@ namespace TShockAPI
/// <summary> /// <summary>
/// For use in a TogglePvp event /// For use in a TogglePvp event
/// </summary> /// </summary>
public class TogglePvpEventArgs : HandledEventArgs public class TogglePvpEventArgs : GetDataHandledEventArgs
{ {
/// <summary> /// <summary>
/// The Terraria player ID of the player /// The Terraria player ID of the player
@ -154,13 +154,15 @@ namespace TShockAPI
/// TogglePvp - called when a player toggles pvp /// TogglePvp - called when a player toggles pvp
/// </summary> /// </summary>
public static HandlerList<TogglePvpEventArgs> TogglePvp = new HandlerList<TogglePvpEventArgs>(); public static HandlerList<TogglePvpEventArgs> TogglePvp = new HandlerList<TogglePvpEventArgs>();
private static bool OnPvpToggled(byte _id, bool _pvp) private static bool OnPvpToggled(TSPlayer player, MemoryStream data, byte _id, bool _pvp)
{ {
if (TogglePvp == null) if (TogglePvp == null)
return false; return false;
var args = new TogglePvpEventArgs var args = new TogglePvpEventArgs
{ {
Player = player,
Data = data,
PlayerId = _id, PlayerId = _id,
Pvp = _pvp, Pvp = _pvp,
}; };
@ -2178,7 +2180,7 @@ namespace TShockAPI
{ {
byte id = args.Data.ReadInt8(); byte id = args.Data.ReadInt8();
bool pvp = args.Data.ReadBoolean(); bool pvp = args.Data.ReadBoolean();
if (OnPvpToggled(id, pvp)) if (OnPvpToggled(args.Player, args.Data, id, pvp))
return true; return true;
if (id != args.Player.Index) if (id != args.Player.Index)