From 3646b2df5aecb8e5bb0df62b4057e0afd11a10eb Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 31 Dec 2011 21:06:06 -0700 Subject: [PATCH 1/4] Remove test --- TShockAPI/GetDataHandlers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index c49b38b9..7d7abd56 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -394,7 +394,7 @@ namespace TShockAPI var args = new LiquidSetEventArgs { - TileX = tilex,// + TileX = tilex, TileY = tiley, Liquid = liquid, Lava = lava, From abfdd43f8f4cb945a76f14f441258bd1c354d241 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 31 Dec 2011 21:10:21 -0700 Subject: [PATCH 2/4] Test --- TShockAPI/GetDataHandlers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 919bd378..b44f0ac4 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -394,7 +394,7 @@ namespace TShockAPI var args = new LiquidSetEventArgs { - TileX = tilex, + TileX = tilex,// TileY = tiley, Liquid = liquid, Lava = lava, From 6b8c4ab2a176d676de85c2ee7c7a2c0f740c1685 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 31 Dec 2011 21:11:07 -0700 Subject: [PATCH 3/4] Remove test --- TShockAPI/GetDataHandlers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index b44f0ac4..919bd378 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -394,7 +394,7 @@ namespace TShockAPI var args = new LiquidSetEventArgs { - TileX = tilex,// + TileX = tilex, TileY = tiley, Liquid = liquid, Lava = lava, From 11ec932d351a296736f09dacceadc8fdbd203805 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sat, 31 Dec 2011 21:21:44 -0700 Subject: [PATCH 4/4] The PlayerSpawn hook now magically has actual spawn stuff as opposed to liquid stuff because we were testing Campfire and Gitlive --- TShockAPI/GetDataHandlers.cs | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 919bd378..4efea14c 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -380,26 +380,24 @@ namespace TShockAPI public class SpawnEventArgs : HandledEventArgs { - public int TileX { get; set; } - public int TileY { get; set; } - public byte Liquid { get; set; } - public bool Lava { get; set; } + public byte Player { get; set; } + public int SpawnX { get; set; } + public int SpawnY { get; set; } } public static HandlerList 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; - var args = new LiquidSetEventArgs + var args = new SpawnEventArgs { - TileX = tilex, - TileY = tiley, - Liquid = liquid, - Lava = lava, + Player = player, + SpawnX = spawnX, + SpawnY = spawnY, }; - LiquidSet.Invoke(null, args); + PlayerSpawn.Invoke(null, args); return args.Handled; } @@ -1515,6 +1513,9 @@ namespace TShockAPI var spawnx = 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.TPlayer.difficulty == 1 && (TShock.Config.KickOnMediumcoreDeath || TShock.Config.BanOnMediumcoreDeath))