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

Merge branch 'master' of github.com:TShock/TShock

Browse source
This commit is contained in:
Shank 2011-06-08 02:51:40 -06:00
commit a4798a35e5
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/TShock.cs
View file

@ -345,7 +345,7 @@ namespace TShockAPI
byte owner = br.ReadByte(); byte owner = br.ReadByte();
byte type = br.ReadByte(); byte type = br.ReadByte();
if (type == 29 || type == 28 || type == 30) if (type == 29 || type == 28 || type == 37)
{ {
return Tools.HandleExplosivesUser(e.Msg.whoAmI, "Throwing an explosive device."); return Tools.HandleExplosivesUser(e.Msg.whoAmI, "Throwing an explosive device.");
} }
@ -394,8 +394,7 @@ namespace TShockAPI
if (Main.player[e.Msg.whoAmI].selectedItem == 0x72) //Dirt Rod if (Main.player[e.Msg.whoAmI].selectedItem == 0x72) //Dirt Rod
{ {
Tools.ForceKick(e.Msg.whoAmI, "Using dirt rod"); return Tools.Kick(e.Msg.whoAmI, "Using dirt rod");
return true;
} }
int plyX = Math.Abs((int)Main.player[e.Msg.whoAmI].position.X / 16); int plyX = Math.Abs((int)Main.player[e.Msg.whoAmI].position.X / 16);