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

Extract common condition

Browse source
This commit is contained in:
SGKoishi 2022-11-28 00:50:45 -08:00
parent 62e6aaa826
commit ac7ee7e706
No known key found for this signature in database
GPG key ID: 8FFC399070653828
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/Bouncer.cs
View file

@ -1716,7 +1716,7 @@ namespace TShockAPI
// Liquid anti-cheat // Liquid anti-cheat
// Arguably the banned buckets bit should be in the item bans system // Arguably the banned buckets bit should be in the item bans system
if (amount != 0) if (amount != 0 && !wasThereABombNearby)
{ {
int selectedItemType = args.Player.TPlayer.inventory[args.Player.TPlayer.selectedItem].type; int selectedItemType = args.Player.TPlayer.inventory[args.Player.TPlayer.selectedItem].type;
@ -1729,49 +1729,49 @@ namespace TShockAPI
args.Handled = true; args.Handled = true;
} }
if (!wasThereABombNearby && type == LiquidType.Lava && !(selectedItemType == ItemID.LavaBucket || selectedItemType == ItemID.EmptyBucket || selectedItemType == ItemID.LavaAbsorbantSponge || selectedItemType == ItemID.BottomlessLavaBucket || selectedItemType == ItemID.UltraAbsorbantSponge)) if (type == LiquidType.Lava && !(selectedItemType == ItemID.LavaBucket || selectedItemType == ItemID.EmptyBucket || selectedItemType == ItemID.LavaAbsorbantSponge || selectedItemType == ItemID.BottomlessLavaBucket || selectedItemType == ItemID.UltraAbsorbantSponge))
{ {
Reject(GetString("Spreading lava without holding a lava bucket")); Reject(GetString("Spreading lava without holding a lava bucket"));
return; return;
} }
if (!wasThereABombNearby && type == LiquidType.Lava && TShock.ItemBans.DataModel.ItemIsBanned("Lava Bucket", args.Player)) if (type == LiquidType.Lava && TShock.ItemBans.DataModel.ItemIsBanned("Lava Bucket", args.Player))
{ {
Reject(GetString("Using banned lava bucket without permissions")); Reject(GetString("Using banned lava bucket without permissions"));
return; return;
} }
if (!wasThereABombNearby && type == LiquidType.Water && !(selectedItemType == ItemID.WaterBucket || selectedItemType == ItemID.EmptyBucket || selectedItemType == ItemID.BottomlessBucket || selectedItemType == ItemID.UltraAbsorbantSponge || selectedItemType == ItemID.SuperAbsorbantSponge)) if (type == LiquidType.Water && !(selectedItemType == ItemID.WaterBucket || selectedItemType == ItemID.EmptyBucket || selectedItemType == ItemID.BottomlessBucket || selectedItemType == ItemID.UltraAbsorbantSponge || selectedItemType == ItemID.SuperAbsorbantSponge))
{ {
Reject(GetString("Spreading water without holding a water bucket")); Reject(GetString("Spreading water without holding a water bucket"));
return; return;
} }
if (!wasThereABombNearby && type == LiquidType.Water && TShock.ItemBans.DataModel.ItemIsBanned("Water Bucket", args.Player)) if (type == LiquidType.Water && TShock.ItemBans.DataModel.ItemIsBanned("Water Bucket", args.Player))
{ {
Reject(GetString("Using banned water bucket without permissions")); Reject(GetString("Using banned water bucket without permissions"));
return; return;
} }
if (!wasThereABombNearby && type == LiquidType.Honey && !(selectedItemType == ItemID.HoneyBucket || selectedItemType == ItemID.EmptyBucket || selectedItemType == ItemID.BottomlessHoneyBucket || selectedItemType == ItemID.HoneyAbsorbantSponge || selectedItemType == ItemID.UltraAbsorbantSponge)) if (type == LiquidType.Honey && !(selectedItemType == ItemID.HoneyBucket || selectedItemType == ItemID.EmptyBucket || selectedItemType == ItemID.BottomlessHoneyBucket || selectedItemType == ItemID.HoneyAbsorbantSponge || selectedItemType == ItemID.UltraAbsorbantSponge))
{ {
Reject(GetString("Spreading honey without holding a honey bucket")); Reject(GetString("Spreading honey without holding a honey bucket"));
return; return;
} }
if (!wasThereABombNearby && type == LiquidType.Honey && TShock.ItemBans.DataModel.ItemIsBanned("Honey Bucket", args.Player)) if (type == LiquidType.Honey && TShock.ItemBans.DataModel.ItemIsBanned("Honey Bucket", args.Player))
{ {
Reject(GetString("Using banned honey bucket without permissions")); Reject(GetString("Using banned honey bucket without permissions"));
return; return;
} }
if (!wasThereABombNearby && type == LiquidType.Shimmer && !(selectedItemType == ItemID.BottomlessShimmerBucket || selectedItemType == ItemID.UltraAbsorbantSponge || selectedItemType == ItemID.SuperAbsorbantSponge)) if (type == LiquidType.Shimmer && !(selectedItemType == ItemID.BottomlessShimmerBucket || selectedItemType == ItemID.UltraAbsorbantSponge || selectedItemType == ItemID.SuperAbsorbantSponge))
{ {
Reject(GetString("Spreading shimmer without holding a shimmer bucket")); Reject(GetString("Spreading shimmer without holding a shimmer bucket"));
return; return;
} }
if (!wasThereABombNearby && type == LiquidType.Shimmer && if (type == LiquidType.Shimmer &&
TShock.ItemBans.DataModel.ItemIsBanned("Bottomless Shimmer Bucket", args.Player)) TShock.ItemBans.DataModel.ItemIsBanned("Bottomless Shimmer Bucket", args.Player))
{ {
Reject(GetString("Using banned bottomless shimmer bucket without permissions")); Reject(GetString("Using banned bottomless shimmer bucket without permissions"));