From ea6425a2e2d99d91bfc8d9621492495f99706c78 Mon Sep 17 00:00:00 2001 From: Chris <2648373+QuiCM@users.noreply.github.com> Date: Mon, 18 May 2020 14:45:36 +0930 Subject: [PATCH] Update Bouncer/Item Bans refs for new models --- TShockAPI/Bouncer.cs | 5 +++-- TShockAPI/ItemBans.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index 60dbecc8..bea5a919 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -30,6 +30,7 @@ using TerrariaApi.Server; using Terraria.ObjectData; using Terraria.DataStructures; using Terraria.Localization; +using TShockAPI.Models.PlayerUpdate; namespace TShockAPI { @@ -97,8 +98,8 @@ namespace TShockAPI internal void OnPlayerUpdate(object sender, GetDataHandlers.PlayerUpdateEventArgs args) { byte plr = args.PlayerId; - BitsByte control = args.Control; - BitsByte pulley = args.MiscData1; + ControlSet control = args.Control; + MiscDataSet1 miscData1 = args.MiscData1; byte item = args.SelectedItem ; var pos = args.Position; var vel = args.Velocity; diff --git a/TShockAPI/ItemBans.cs b/TShockAPI/ItemBans.cs index 0ebd7ee6..b4fed4ba 100644 --- a/TShockAPI/ItemBans.cs +++ b/TShockAPI/ItemBans.cs @@ -154,7 +154,7 @@ namespace TShockAPI internal void OnPlayerUpdate(object sender, PlayerUpdateEventArgs args) { DisableFlags disableFlags = TShock.Config.DisableSecondUpdateLogs ? DisableFlags.WriteToConsole : DisableFlags.WriteToLogAndConsole; - bool useItem = ((BitsByte) args.Control)[5]; + bool useItem = args.Control.IsUsingItem; TSPlayer player = args.Player; string itemName = player.TPlayer.inventory[args.SelectedItem].Name;