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

Fixed liquid removal exploit

Browse source
This commit is contained in:
MarioE 2012-07-02 16:10:30 -04:00
parent 00db1b1b09
commit 50681d0d38
1 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

55
TShockAPI/GetDataHandlers.cs
View file

@ -2126,11 +2126,6 @@ namespace TShockAPI
if (OnLiquidSet(tileX, tileY, liquid, lava)) if (OnLiquidSet(tileX, tileY, liquid, lava))
return true; return true;
//The liquid was picked up.
if (liquid == 0)
return false;
if (tileX < 0 || tileX >= Main.maxTilesX || tileY < 0 || tileY >= Main.maxTilesY) if (tileX < 0 || tileX >= Main.maxTilesX || tileY < 0 || tileY >= Main.maxTilesY)
return false; return false;
@ -2151,32 +2146,34 @@ namespace TShockAPI
{ {
args.Player.TileLiquidThreshold++; args.Player.TileLiquidThreshold++;
} }
if (liquid != 0)
{
int bucket = 0;
if (args.TPlayer.inventory[args.TPlayer.selectedItem].type == 206)
{
bucket = 1;
}
else if (args.TPlayer.inventory[args.TPlayer.selectedItem].type == 207)
{
bucket = 2;
}
int bucket = 0; if (lava && bucket != 2 && !args.Player.Group.HasPermission(Permissions.usebanneditem) &&
if (args.TPlayer.inventory[args.TPlayer.selectedItem].type == 206) TShock.Itembans.ItemIsBanned("Lava Bucket", args.Player))
{ {
bucket = 1; args.Player.Disable("Using banned lava bucket without permissions.");
} args.Player.SendTileSquare(tileX, tileY);
else if (args.TPlayer.inventory[args.TPlayer.selectedItem].type == 207) return true;
{ }
bucket = 2;
}
if (lava && bucket != 2 && !args.Player.Group.HasPermission(Permissions.usebanneditem) && if (!lava && bucket != 1 && !args.Player.Group.HasPermission(Permissions.usebanneditem) &&
TShock.Itembans.ItemIsBanned("Lava Bucket", args.Player)) TShock.Itembans.ItemIsBanned("Water Bucket", args.Player))
{ {
args.Player.Disable("Using banned lava bucket without permissions."); args.Player.Disable("Using banned water bucket without permissions.");
args.Player.SendTileSquare(tileX, tileY); args.Player.SendTileSquare(tileX, tileY);
return true; return true;
} }
}
if (!lava && bucket != 1 && !args.Player.Group.HasPermission(Permissions.usebanneditem) &&
TShock.Itembans.ItemIsBanned("Water Bucket", args.Player))
{
args.Player.Disable("Using banned water bucket without permissions.");
args.Player.SendTileSquare(tileX, tileY);
return true;
}
if (TShock.CheckTilePermission(args.Player, tileX, tileY)) if (TShock.CheckTilePermission(args.Player, tileX, tileY))
{ {