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

Merge pull request #978 from Patrikkk/general-devel

Browse source 
Actually return entered region at OnRegionEntered
This commit is contained in:
White 2015-07-10 11:28:26 +09:30
commit 58c4637021
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TShockAPI/Hooks/RegionHooks.cs
View file

@ -26,22 +26,25 @@ namespace TShockAPI.Hooks
{
public TSPlayer Player { get; private set; }
public RegionEnteredEventArgs(TSPlayer ply)
public Region Region { get; private set; }
public RegionEnteredEventArgs(TSPlayer ply, Region region)
{
Player = ply;
Region = region;
}
}
public delegate void RegionEnteredD(RegionEnteredEventArgs args);
public static event RegionEnteredD RegionEntered;
public static void OnRegionEntered(TSPlayer player)
public static void OnRegionEntered(TSPlayer player, Region region)
{
if (RegionEntered == null)
{
return;
}
RegionEntered(new RegionEnteredEventArgs(player));
RegionEntered(new RegionEnteredEventArgs(player, region));
}
public class RegionLeftEventArgs

2
TShockAPI/TShock.cs
View file

@ -902,7 +902,7 @@ namespace TShockAPI
if (player.CurrentRegion != null)
{
Hooks.RegionHooks.OnRegionEntered(player);
Hooks.RegionHooks.OnRegionEntered(player, player.CurrentRegion);
}
}
}