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

Some water fixes.

Browse source
This commit is contained in:
Zack Piispanen 2013-09-30 19:12:09 -04:00
parent 98a7e7f080
commit b8a5492b20
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/GetDataHandlers.cs
View file

@ -2408,8 +2408,12 @@ namespace TShockAPI
} }
if (amount != 0) if (amount != 0)
{ {
int bucket = 0; int bucket = -1;
if (args.TPlayer.inventory[args.TPlayer.selectedItem].type == 206) if (args.TPlayer.inventory[args.TPlayer.selectedItem].type == 205)
{
bucket = 0;
}
else if (args.TPlayer.inventory[args.TPlayer.selectedItem].type == 206)
{ {
bucket = 1; bucket = 1;
} }
@ -2417,12 +2421,12 @@ namespace TShockAPI
{ {
bucket = 2; bucket = 2;
} }
else if (args.TPlayer.inventory[args.TPlayer.selectedItem].type == 207) else if (args.TPlayer.inventory[args.TPlayer.selectedItem].type == 1128)
{ {
bucket = 3; bucket = 3;
} }
if(type == 1 && bucket != 2) if (type == 1 && !(bucket == 2 || bucket == 0))
{ {
args.Player.SendErrorMessage("You do not have permission to perform this action."); args.Player.SendErrorMessage("You do not have permission to perform this action.");
args.Player.Disable("Spreading lava without holding a lava bucket"); args.Player.Disable("Spreading lava without holding a lava bucket");
@ -2439,7 +2443,7 @@ namespace TShockAPI
return true; return true;
} }
if (type == 0 && bucket != 1) if (type == 0 && !(bucket == 1 || bucket == 0))
{ {
args.Player.SendErrorMessage("You do not have permission to perform this action."); args.Player.SendErrorMessage("You do not have permission to perform this action.");
args.Player.Disable("Spreading water without holding a water bucket"); args.Player.Disable("Spreading water without holding a water bucket");
@ -2456,10 +2460,10 @@ namespace TShockAPI
return true; return true;
} }
if (type == 2 && bucket != 3) if (type == 2 &&!(bucket == 3 || bucket == 0))
{ {
args.Player.SendErrorMessage("You do not have permission to perform this action."); args.Player.SendErrorMessage("You do not have permission to perform this action.");
args.Player.Disable("Spreading water without holding a water bucket"); args.Player.Disable("Spreading honey without holding a honey bucket");
args.Player.SendTileSquare(tileX, tileY); args.Player.SendTileSquare(tileX, tileY);
return true; return true;
} }

2
TShockAPI/TSPlayer.cs
View file

@ -395,7 +395,7 @@ namespace TShockAPI
bool flag = false; bool flag = false;
if (RealPlayer) if (RealPlayer)
{ {
for (int i = 0; i < 50; i++) //41 is trash can, 42-45 is coins, 46-49 is ammo for (int i = 0; i < 50; i++) //51 is trash can, 52-55 is coins, 56-59 is ammo
{ {
if (TPlayer.inventory[i] == null || !TPlayer.inventory[i].active || TPlayer.inventory[i].name == "") if (TPlayer.inventory[i] == null || !TPlayer.inventory[i].active || TPlayer.inventory[i].name == "")
{ {