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

Merge pull request #3116 from ACaiCat/general-devel

Browse source 
fix(Bouncer): fix players bypass region protection and build permissions when using Quick Stack
This commit is contained in:
Chris 2026-01-18 16:09:28 +10:30 • committed by GitHub
commit 108c856fd1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

36
TShockAPI/Bouncer.cs
View file

@ -19,7 +19,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Terraria.ID;
using TShockAPI.Net;
using Terraria;
using Microsoft.Xna.Framework;
using TShockAPI.Localization;
@ -29,6 +28,7 @@ using Terraria.DataStructures;
using Terraria.Localization;
using TShockAPI.Models.PlayerUpdate;
using System.Threading.Tasks;
using OTAPI;
using Terraria.GameContent.Tile_Entities;
namespace TShockAPI
@ -137,6 +137,7 @@ namespace TShockAPI
GetDataHandlers.KillMe += OnKillMe;
GetDataHandlers.FishOutNPC += OnFishOutNPC;
GetDataHandlers.FoodPlatterTryPlacing += OnFoodPlatterTryPlacing;
OTAPI.Hooks.Chest.QuickStack += OnQuickStack;
// The following section is based off Player.PlaceThing_Tiles_PlaceIt and Player.PlaceThing_Tiles_PlaceIt_GetLegacyTileStyle.
@ -2534,7 +2535,7 @@ namespace TShockAPI
Main.item[num].playerIndexTheItemIsReservedFor = args.Player.Index;
NetMessage.SendData((int)PacketTypes.ItemDrop, args.Player.Index, -1, NetworkText.Empty, num, 1f);
NetMessage.SendData((int)PacketTypes.ItemOwner, args.Player.Index, -1, NetworkText.Empty, num);
TShock.Log.ConsoleDebug(GetString("Bouncer / OnPlaceItemFrame rejected permissions from {0}", args.Player.Name));
NetMessage.SendData((int)PacketTypes.UpdateTileEntity, -1, -1, NetworkText.Empty, args.ItemFrame.ID, 0, 1);
args.Handled = true;
@ -2900,6 +2901,37 @@ namespace TShockAPI
}
}
/// <summary>
/// Called when a player is trying to put an item into chest through Quick Stack.
/// </summary>
/// <param name="sender"></param>
/// <param name="args"></param>
internal void OnQuickStack(object sender, OTAPI.Hooks.Chest.QuickStackEventArgs args)
{
var id = args.ChestIndex;
var plr = TShock.Players[args.PlayerId];
if (plr is not { Active: true })
{
args.Result = HookResult.Cancel;
return;
}
if (plr.IsBeingDisabled())
{
TShock.Log.ConsoleDebug(GetString("Bouncer / OnQuickStack rejected from disable from {0}", plr.Name));
args.Result = HookResult.Cancel;
return;
}
if (!plr.HasBuildPermission(Main.chest[id].x, Main.chest[id].y) && TShock.Config.Settings.RegionProtectChests)
{
TShock.Log.ConsoleDebug(GetString("Bouncer / OnQuickStack rejected from region protection? from {0}", plr.Name));
args.Result = HookResult.Cancel;
return;
}
}
internal void OnSecondUpdate()
{
Task.Run(() =>