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

Update Bouncer/Item Bans refs for new models

Browse source
This commit is contained in:
Chris 2020-05-18 14:45:36 +09:30
parent a1243a580c
commit ea6425a2e2
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/Bouncer.cs
View file

@ -30,6 +30,7 @@ using TerrariaApi.Server;
using Terraria.ObjectData; using Terraria.ObjectData;
using Terraria.DataStructures; using Terraria.DataStructures;
using Terraria.Localization; using Terraria.Localization;
using TShockAPI.Models.PlayerUpdate;
namespace TShockAPI namespace TShockAPI
{ {
@ -97,8 +98,8 @@ namespace TShockAPI
internal void OnPlayerUpdate(object sender, GetDataHandlers.PlayerUpdateEventArgs args) internal void OnPlayerUpdate(object sender, GetDataHandlers.PlayerUpdateEventArgs args)
{ {
byte plr = args.PlayerId; byte plr = args.PlayerId;
BitsByte control = args.Control; ControlSet control = args.Control;
BitsByte pulley = args.MiscData1; MiscDataSet1 miscData1 = args.MiscData1;
byte item = args.SelectedItem ; byte item = args.SelectedItem ;
var pos = args.Position; var pos = args.Position;
var vel = args.Velocity; var vel = args.Velocity;

2
TShockAPI/ItemBans.cs
View file

@ -154,7 +154,7 @@ namespace TShockAPI
internal void OnPlayerUpdate(object sender, PlayerUpdateEventArgs args) internal void OnPlayerUpdate(object sender, PlayerUpdateEventArgs args)
{ {
DisableFlags disableFlags = TShock.Config.DisableSecondUpdateLogs ? DisableFlags.WriteToConsole : DisableFlags.WriteToLogAndConsole; DisableFlags disableFlags = TShock.Config.DisableSecondUpdateLogs ? DisableFlags.WriteToConsole : DisableFlags.WriteToLogAndConsole;
bool useItem = ((BitsByte) args.Control)[5]; bool useItem = args.Control.IsUsingItem;
TSPlayer player = args.Player; TSPlayer player = args.Player;
string itemName = player.TPlayer.inventory[args.SelectedItem].Name; string itemName = player.TPlayer.inventory[args.SelectedItem].Name;