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

Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Browse source
This commit is contained in:
high 2011-12-31 23:26:07 -05:00
commit 5244c2aab7
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
TShockAPI/GetDataHandlers.cs
View file

@ -380,26 +380,24 @@ namespace TShockAPI
public class SpawnEventArgs : HandledEventArgs public class SpawnEventArgs : HandledEventArgs
{ {
public int TileX { get; set; } public byte Player { get; set; }
public int TileY { get; set; } public int SpawnX { get; set; }
public byte Liquid { get; set; } public int SpawnY { get; set; }
public bool Lava { get; set; }
} }
public static HandlerList<SpawnEventArgs> PlayerSpawn; public static HandlerList<SpawnEventArgs> PlayerSpawn;
private static bool OnPlayerSpawn(int tilex, int tiley, byte liquid, bool lava) private static bool OnPlayerSpawn(byte player, int spawnX, int spawnY)
{ {
if (LiquidSet == null) if (PlayerSpawn == null)
return false; return false;
var args = new LiquidSetEventArgs var args = new SpawnEventArgs
{ {
TileX = tilex,// Player = player,
TileY = tiley, SpawnX = spawnX,
Liquid = liquid, SpawnY = spawnY,
Lava = lava,
}; };
LiquidSet.Invoke(null, args); PlayerSpawn.Invoke(null, args);
return args.Handled; return args.Handled;
} }
@ -1515,6 +1513,9 @@ namespace TShockAPI
var spawnx = args.Data.ReadInt32(); var spawnx = args.Data.ReadInt32();
var spawny = args.Data.ReadInt32(); var spawny = args.Data.ReadInt32();
if (OnPlayerSpawn(player, spawnx, spawny))
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)
{ {
if (args.TPlayer.difficulty == 1 && (TShock.Config.KickOnMediumcoreDeath || TShock.Config.BanOnMediumcoreDeath)) if (args.TPlayer.difficulty == 1 && (TShock.Config.KickOnMediumcoreDeath || TShock.Config.BanOnMediumcoreDeath))