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

Explosives are no longer blocked by range checks

Browse source
This commit is contained in:
ProfessorXZ 2016-08-14 23:10:24 +02:00
parent 60b7e7d574
commit 4d98dd4d24
1 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
TShockAPI/GetDataHandlers.cs
View file

@ -2030,7 +2030,6 @@ namespace TShockAPI
// If they aren't selecting a hammer, they could be hacking. // If they aren't selecting a hammer, they could be hacking.
if (selectedItem.hammer == 0 && !ItemID.Sets.Explosives[selectedItem.netID] && args.Player.RecentFuse == 0 && selectedItem.createWall == 0) if (selectedItem.hammer == 0 && !ItemID.Sets.Explosives[selectedItem.netID] && args.Player.RecentFuse == 0 && selectedItem.createWall == 0)
{ {
args.Player.SendTileSquare(tileX, tileY, 1); args.Player.SendTileSquare(tileX, tileY, 1);
return true; return true;
} }
@ -2149,13 +2148,30 @@ namespace TShockAPI
} }
// Ignore rope placement range // Ignore rope placement range
if ((editData != TileID.Rope //if ((editData != TileID.Rope
&& editData != TileID.SilkRope // && editData != TileID.SilkRope
&& editData != TileID.VineRope // && editData != TileID.VineRope
&& editData != TileID.WebRope // && editData != TileID.WebRope
&& action == EditAction.PlaceTile) // && action == EditAction.PlaceTile)
&& TShock.CheckRangePermission(args.Player, tileX, tileY)) // && TShock.CheckRangePermission(args.Player, tileX, tileY))
//{
// args.Player.SendTileSquare(tileX, tileY, 4);
// return true;
//}
if (TShock.CheckRangePermission(args.Player, tileX, tileY))
{ {
if (action == EditAction.PlaceTile && (editData == TileID.Rope || editData == TileID.SilkRope || editData == TileID.VineRope || editData == TileID.WebRope))
{
args.Player.SendTileSquare(tileX, tileY, 4);
return false;
}
if ((action == EditAction.KillTile || action == EditAction.KillWall) && ItemID.Sets.Explosives[selectedItem.netID] && args.Player.RecentFuse == 0)
{
args.Player.SendTileSquare(tileX, tileY, 4);
return false;
}
args.Player.SendTileSquare(tileX, tileY, 4); args.Player.SendTileSquare(tileX, tileY, 4);
return true; return true;
} }