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

OnPlayerSpawn now uses GetDataHandledEventArgs.

Browse source 
OnPlayerSpawn's player ID field is now PlayerID.
This commit is contained in:
Lucas Nicodemus 2017-12-23 15:06:01 -07:00
parent 4c3600f58d
commit df9920564a
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/GetDataHandlers.cs
View file

@ -852,12 +852,12 @@ namespace TShockAPI
/// <summary> /// <summary>
/// For use in a PlayerSpawn event /// For use in a PlayerSpawn event
/// </summary> /// </summary>
public class SpawnEventArgs : HandledEventArgs public class SpawnEventArgs : GetDataHandledEventArgs
{ {
/// <summary> /// <summary>
/// The Terraria playerID of the player /// The Terraria playerID of the player
/// </summary> /// </summary>
public byte Player { get; set; } public byte PlayerID { get; set; }
/// <summary> /// <summary>
/// X location of the player's spawn /// X location of the player's spawn
/// </summary> /// </summary>
@ -872,7 +872,7 @@ namespace TShockAPI
/// </summary> /// </summary>
public static HandlerList<SpawnEventArgs> PlayerSpawn = new HandlerList<SpawnEventArgs>(); public static HandlerList<SpawnEventArgs> PlayerSpawn = new HandlerList<SpawnEventArgs>();
private static bool OnPlayerSpawn(byte player, int spawnX, int spawnY) private static bool OnPlayerSpawn(TSPlayer player, MemoryStream data, byte pid, int spawnX, int spawnY)
{ {
if (PlayerSpawn == null) if (PlayerSpawn == null)
return false; return false;
@ -880,6 +880,8 @@ namespace TShockAPI
var args = new SpawnEventArgs var args = new SpawnEventArgs
{ {
Player = player, Player = player,
Data = data,
PlayerID = pid,
SpawnX = spawnX, SpawnX = spawnX,
SpawnY = spawnY, SpawnY = spawnY,
}; };
@ -2495,7 +2497,7 @@ namespace TShockAPI
var spawnx = args.Data.ReadInt16(); var spawnx = args.Data.ReadInt16();
var spawny = args.Data.ReadInt16(); var spawny = args.Data.ReadInt16();
if (OnPlayerSpawn(player, spawnx, spawny)) if (OnPlayerSpawn(args.Player, args.Data, player, spawnx, spawny))
return true; return true;
if (args.Player.InitSpawn && args.TPlayer.inventory[args.TPlayer.selectedItem].type != 50) if (args.Player.InitSpawn && args.TPlayer.inventory[args.TPlayer.selectedItem].type != 50)