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

This commit is contained in:
Lucas Nicodemus 2012-01-01 15:56:09 -07:00
commit 2437225f10

View file

@ -255,7 +255,7 @@ namespace TShockAPI
private static bool OnKillMe(byte plr, byte direction, short damage, bool pvp) private static bool OnKillMe(byte plr, byte direction, short damage, bool pvp)
{ {
if (TileKill == null) if (KillMe == null)
return false; return false;
var args = new KillMeEventArgs var args = new KillMeEventArgs