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:
Lucas Nicodemus 2012-01-01 15:56:09 -07:00
commit 2437225f10
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/GetDataHandlers.cs
View file

@ -84,7 +84,7 @@ namespace TShockAPI
TileEdit.Invoke(null, args); TileEdit.Invoke(null, args);
return args.Handled; return args.Handled;
} }
public class TogglePvpEventArgs : HandledEventArgs public class TogglePvpEventArgs : HandledEventArgs
{ {
public byte PlayerId { get; set; } public byte PlayerId { get; set; }
@ -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