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

Exclude unused fields, allow tileMoss, SandSpray and SnowSpray

Browse source
This commit is contained in:
SGKoishi 2022-12-10 13:36:13 -08:00
parent d2037a62e5
commit 656a6a49be
No known key found for this signature in database
GPG key ID: 8FFC399070653828
1 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

38
TShockAPI/Handlers/SendTileRectHandler.cs
View file

@ -390,8 +390,18 @@ namespace TShockAPI.Handlers
} }
} }
private static List<bool[]> _convertibleTiles = typeof(TileID.Sets.Conversion).GetFields().Select(f => (bool[])f.GetValue(null)).ToList(); // Moss and MossBrick are not used in conversion
private static List<bool[]> _convertibleWalls = typeof(WallID.Sets.Conversion).GetFields().Select(f => (bool[])f.GetValue(null)).ToList(); private static List<bool[]> _convertibleTiles = typeof(TileID.Sets.Conversion)
.GetFields()
.ExceptBy(new[] { nameof(TileID.Sets.Conversion.Moss), nameof(TileID.Sets.Conversion.MossBrick) }, f => f.Name)
.Select(f => (bool[])f.GetValue(null))
.ToList();
// PureSand is only used in WorldGen.SpreadDesertWalls, which is server side
private static List<bool[]> _convertibleWalls = typeof(WallID.Sets.Conversion)
.GetFields()
.ExceptBy(new[] { nameof(WallID.Sets.Conversion.PureSand) }, f => f.Name)
.Select(f => (bool[])f.GetValue(null))
.ToList();
/// <summary> /// <summary>
/// Updates a single tile on the server if it is a valid conversion from one tile or wall type to another (eg stone -> corrupt stone) /// Updates a single tile on the server if it is a valid conversion from one tile or wall type to another (eg stone -> corrupt stone)
@ -400,15 +410,34 @@ namespace TShockAPI.Handlers
/// <param name="newTile">The NetTile containing new tile properties</param> /// <param name="newTile">The NetTile containing new tile properties</param>
internal void ProcessConversionSpreads(ITile tile, NetTile newTile) internal void ProcessConversionSpreads(ITile tile, NetTile newTile)
{ {
// Update if the existing tile or wall is convertible and the new tile or wall is a valid conversion var allowTile = false;
if (Main.tileMoss[tile.type] && TileID.Sets.Conversion.Stone[newTile.Type])
{
allowTile = true;
}
else if ((Main.tileMoss[tile.type] || TileID.Sets.Conversion.Stone[tile.type] || TileID.Sets.Conversion.Ice[tile.type] || TileID.Sets.Conversion.Sandstone[tile.type]) &&
(newTile.Type == TileID.Sandstone || newTile.Type == TileID.IceBlock))
{
// ProjectileID.SandSpray and ProjectileID.SnowSpray
allowTile = true;
}
else
{
foreach (var tileType in _convertibleTiles) foreach (var tileType in _convertibleTiles)
{ {
if (tileType[tile.type] && tileType[newTile.Type]) if (tileType[tile.type] && tileType[newTile.Type])
{
allowTile = true;
break;
}
}
}
if (allowTile)
{ {
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect processing a tile conversion update - [{tile.type}] -> [{newTile.Type}]")); TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect processing a tile conversion update - [{tile.type}] -> [{newTile.Type}]"));
UpdateServerTileState(tile, newTile, TileDataType.Tile); UpdateServerTileState(tile, newTile, TileDataType.Tile);
} }
}
foreach (var wallType in _convertibleWalls) foreach (var wallType in _convertibleWalls)
{ {
@ -416,6 +445,7 @@ namespace TShockAPI.Handlers
{ {
TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect processing a wall conversion update - [{tile.wall}] -> [{newTile.Wall}]")); TShock.Log.ConsoleDebug(GetString($"Bouncer / SendTileRect processing a wall conversion update - [{tile.wall}] -> [{newTile.Wall}]"));
UpdateServerTileState(tile, newTile, TileDataType.Wall); UpdateServerTileState(tile, newTile, TileDataType.Wall);
break;
} }
} }
} }