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

Fixed Super Sponge unable to absorb shimmer

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

11
TShockAPI/Bouncer.cs
View file

@ -1736,8 +1736,7 @@ namespace TShockAPI
{ {
bucket = 3; bucket = 3;
} }
else if (selectedItemType == ItemID.BottomlessBucket || else if (selectedItemType == ItemID.BottomlessBucket)
selectedItemType == ItemID.SuperAbsorbantSponge)
{ {
bucket = 4; bucket = 4;
} }
@ -1762,6 +1761,10 @@ namespace TShockAPI
{ {
bucket = 9; bucket = 9;
} }
else if (selectedItemType == ItemID.SuperAbsorbantSponge)
{
bucket = 10;
}
if (!wasThereABombNearby && type == LiquidType.Lava && !(bucket == 2 || bucket == 0 || bucket == 5 || bucket == 6 || bucket == 9)) if (!wasThereABombNearby && type == LiquidType.Lava && !(bucket == 2 || bucket == 0 || bucket == 5 || bucket == 6 || bucket == 9))
{ {
@ -1783,7 +1786,7 @@ namespace TShockAPI
return; return;
} }
if (!wasThereABombNearby && type == LiquidType.Water && !(bucket == 1 || bucket == 0 || bucket == 4 || bucket == 9)) if (!wasThereABombNearby && type == LiquidType.Water && !(bucket == 1 || bucket == 0 || bucket == 4 || bucket == 9 || bucket == 10))
{ {
TShock.Log.ConsoleDebug(GetString("Bouncer / OnLiquidSet rejected bucket check 2 from {0}", args.Player.Name)); TShock.Log.ConsoleDebug(GetString("Bouncer / OnLiquidSet rejected bucket check 2 from {0}", args.Player.Name));
args.Player.SendErrorMessage(GetString("You do not have permission to perform this action.")); args.Player.SendErrorMessage(GetString("You do not have permission to perform this action."));
@ -1823,7 +1826,7 @@ namespace TShockAPI
return; return;
} }
if (!wasThereABombNearby && type == LiquidType.Shimmer && !(bucket == 8 || bucket == 9)) if (!wasThereABombNearby && type == LiquidType.Shimmer && !(bucket == 8 || bucket == 9 || bucket == 10))
{ {
TShock.Log.ConsoleDebug(GetString("Bouncer / OnLiquidSet rejected bucket check 6 from {0}", args.Player.Name)); TShock.Log.ConsoleDebug(GetString("Bouncer / OnLiquidSet rejected bucket check 6 from {0}", args.Player.Name));
args.Player.SendErrorMessage(GetString("You do not have permission to perform this action.")); args.Player.SendErrorMessage(GetString("You do not have permission to perform this action."));