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

fix(OnTileEdit): item disappeared when hitting an ItemFrame without permission

Browse source
This commit is contained in:
Cai 2025-05-11 12:00:42 +08:00
parent 57a3173a4d
commit 7db908195f
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/Bouncer.cs
View file

@ -29,6 +29,7 @@ using Terraria.DataStructures;
using Terraria.Localization; using Terraria.Localization;
using TShockAPI.Models.PlayerUpdate; using TShockAPI.Models.PlayerUpdate;
using System.Threading.Tasks; using System.Threading.Tasks;
using Terraria.GameContent.Tile_Entities;
namespace TShockAPI namespace TShockAPI
{ {
@ -605,6 +606,7 @@ namespace TShockAPI
int tileY = args.Y; int tileY = args.Y;
short editData = args.EditData; short editData = args.EditData;
EditType type = args.editDetail; EditType type = args.editDetail;
ITile tile = Main.tile[tileX, tileY];
// 'placeStyle' is a term used in Terraria land to determine which frame of a sprite is displayed when the sprite is placed. The placeStyle // 'placeStyle' is a term used in Terraria land to determine which frame of a sprite is displayed when the sprite is placed. The placeStyle
// determines the frameX and frameY offsets // determines the frameX and frameY offsets
@ -625,6 +627,15 @@ namespace TShockAPI
{ {
TShock.Log.ConsoleDebug(GetString("Bouncer / OnTileEdit rejected from build from {0} {1} {2}", args.Player.Name, action, editData)); TShock.Log.ConsoleDebug(GetString("Bouncer / OnTileEdit rejected from build from {0} {1} {2}", args.Player.Name, action, editData));
if (tile.type == TileID.ItemFrame)
{
int itemFrameId = TEItemFrame.Find(tileX - tile.frameX % 36 / 18, tileY - tile.frameY % 36 / 18);
if (itemFrameId != -1)
{
NetMessage.SendData((int)PacketTypes.UpdateTileEntity, -1, -1, NetworkText.Empty, itemFrameId, 0, 1);
}
}
GetRollbackRectSize(tileX, tileY, out byte width, out byte length, out int offsetY); GetRollbackRectSize(tileX, tileY, out byte width, out byte length, out int offsetY);
args.Player.SendTileRect((short)(tileX - width), (short)(tileY + offsetY), (byte)(width * 2), (byte)(length + 1)); args.Player.SendTileRect((short)(tileX - width), (short)(tileY + offsetY), (byte)(width * 2), (byte)(length + 1));
args.Handled = true; args.Handled = true;
@ -658,7 +669,6 @@ namespace TShockAPI
Item selectedItem = args.Player.SelectedItem; Item selectedItem = args.Player.SelectedItem;
int lastKilledProj = args.Player.LastKilledProjectile; int lastKilledProj = args.Player.LastKilledProjectile;
ITile tile = Main.tile[tileX, tileY];
if (action == EditAction.PlaceTile || action == EditAction.ReplaceTile) if (action == EditAction.PlaceTile || action == EditAction.ReplaceTile)
{ {