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

Add helper method for getting max placeStyle

Browse source
This commit is contained in:
Arthri 2021-07-25 16:29:05 +08:00
parent fd3e857f06
commit ca31a15be9
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
TShockAPI/Bouncer.cs
View file

@ -424,11 +424,8 @@ namespace TShockAPI
} }
else if (action == EditAction.PlaceTile || action == EditAction.ReplaceTile || action == EditAction.PlaceWall || action == EditAction.ReplaceWall) else if (action == EditAction.PlaceTile || action == EditAction.ReplaceTile || action == EditAction.PlaceWall || action == EditAction.ReplaceWall)
{ {
var isInvalidPlaceStyle = ExtraneousPlaceStyles.ContainsKey(editData)
? style > ExtraneousPlaceStyles[editData]
: MaxPlaceStyles.ContainsKey(editData) && style > MaxPlaceStyles[editData];
if ((action == EditAction.PlaceTile && TShock.Config.Settings.PreventInvalidPlaceStyle) && if ((action == EditAction.PlaceTile && TShock.Config.Settings.PreventInvalidPlaceStyle) &&
isInvalidPlaceStyle) style > GetMaxPlaceStyle(editData))
{ {
TShock.Log.ConsoleDebug("Bouncer / OnTileEdit rejected from (ms1) {0} {1} {2}", args.Player.Name, action, editData); TShock.Log.ConsoleDebug("Bouncer / OnTileEdit rejected from (ms1) {0} {1} {2}", args.Player.Name, action, editData);
args.Player.SendTileSquare(tileX, tileY, 4); args.Player.SendTileSquare(tileX, tileY, 4);
@ -2228,6 +2225,25 @@ namespace TShockAPI
}); });
} }
/// <summary>
/// Returns the max <see cref="Item.placeStyle"/> associated with the given <paramref name="tileID"/>. Or -1 if there's no association
/// </summary>
/// <param name="tileID">Tile ID to query for</param>
/// <returns>The max <see cref="Item.placeStyle"/>, otherwise -1 if there's no association</returns>
internal static int GetMaxPlaceStyle(int tileID)
{
int result;
if (ExtraneousPlaceStyles.TryGetValue(tileID, out result)
|| MaxPlaceStyles.TryGetValue(tileID, out result))
{
return result;
}
else
{
return -1;
}
}
// These time values are references from Projectile.cs, at npc.AddBuff() calls. // These time values are references from Projectile.cs, at npc.AddBuff() calls.
private static Dictionary<int, short> NPCAddBuffTimeMax = new Dictionary<int, short>() private static Dictionary<int, short> NPCAddBuffTimeMax = new Dictionary<int, short>()
{ {