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

Fix tabs

Browse source
This commit is contained in:
Zack Piispanen 2013-10-01 18:05:38 -04:00
parent f405e7cbd6
commit 435029dbeb
1 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

54
TShockAPI/GetDataHandlers.cs
View file

@ -3161,8 +3161,8 @@ namespace TShockAPI
boss = "a Goblin Invasion"; boss = "a Goblin Invasion";
break; break;
default: default:
boss = String.Format("the {0}", npc.name); boss = String.Format("the {0}", npc.name);
break; break;
} }
TShock.Utils.SendLogs(string.Format("{0} summoned {1}", args.Player.Name, boss), Color.PaleVioletRed, args.Player); TShock.Utils.SendLogs(string.Format("{0} summoned {1}", args.Player.Name, boss), Color.PaleVioletRed, args.Player);
@ -3171,36 +3171,36 @@ namespace TShockAPI
private static bool HandlePaintTile(GetDataHandlerArgs args) private static bool HandlePaintTile(GetDataHandlerArgs args)
{ {
var x = args.Data.ReadInt32(); var x = args.Data.ReadInt32();
var y = args.Data.ReadInt32(); var y = args.Data.ReadInt32();
var t = args.Data.ReadInt8(); var t = args.Data.ReadInt8();
if (OnPaintTile(x, y, t)) if (OnPaintTile(x, y, t))
return true; return true;
if (!args.Player.Group.HasPermission(Permissions.canpaint)) if (!args.Player.Group.HasPermission(Permissions.canpaint))
{ {
args.Player.SendTileSquare(x, y); args.Player.SendTileSquare(x, y);
return true; return true;
} }
return false; return false;
} }
private static bool HandlePaintWall(GetDataHandlerArgs args) private static bool HandlePaintWall(GetDataHandlerArgs args)
{ {
var x = args.Data.ReadInt32(); var x = args.Data.ReadInt32();
var y = args.Data.ReadInt32(); var y = args.Data.ReadInt32();
var t = args.Data.ReadInt8(); var t = args.Data.ReadInt8();
if (OnPaintTile(x, y, t)) if (OnPaintTile(x, y, t))
return true; return true;
if (!args.Player.Group.HasPermission(Permissions.canpaint)) if (!args.Player.Group.HasPermission(Permissions.canpaint))
{ {
args.Player.SendTileSquare(x, y); args.Player.SendTileSquare(x, y);
return true; return true;
} }
return false; return false;
} }
@ -3215,11 +3215,7 @@ namespace TShockAPI
return true; return true;
byte style = 0; byte style = 0;
var isNPC = false; var isNPC = false || (flag & 1) == 1;
if ((flag & 1) == 1)
{
isNPC = true;
}
if ((flag & 2) != 2) if ((flag & 2) != 2)
{ {