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

Register DisplayDollItemSyncHandler.

Browse source 
Moved the type check for 0 before itemSetDefaults to have less code run if the empty slots are clicked.
This commit is contained in:
Patrikkk 2020-06-25 01:42:22 +02:00
parent 90dd61e668
commit 38a1351d38
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Bouncer.cs
View file

@ -39,6 +39,7 @@ namespace TShockAPI
internal Handlers.SendTileSquareHandler STSHandler { get; set; } internal Handlers.SendTileSquareHandler STSHandler { get; set; }
internal Handlers.NetModules.NetModulePacketHandler NetModuleHandler { get; set; } internal Handlers.NetModules.NetModulePacketHandler NetModuleHandler { get; set; }
internal Handlers.EmojiHandler EmojiHandler { get; set; } internal Handlers.EmojiHandler EmojiHandler { get; set; }
internal Handlers.DisplayDollItemSyncHandler DisplayDollItemSyncHandler { get; set; }
internal Handlers.LandGolfBallInCupHandler LandGolfBallInCupHandler { get; set; } internal Handlers.LandGolfBallInCupHandler LandGolfBallInCupHandler { get; set; }
internal Handlers.SyncTilePickingHandler SyncTilePickingHandler { get; set; } internal Handlers.SyncTilePickingHandler SyncTilePickingHandler { get; set; }
@ -52,9 +53,12 @@ namespace TShockAPI
NetModuleHandler = new Handlers.NetModules.NetModulePacketHandler(); NetModuleHandler = new Handlers.NetModules.NetModulePacketHandler();
GetDataHandlers.ReadNetModule += NetModuleHandler.OnReceive; GetDataHandlers.ReadNetModule += NetModuleHandler.OnReceive;
DisplayDollItemSyncHandler = new Handlers.DisplayDollItemSyncHandler();
GetDataHandlers.DisplayDollItemSync += DisplayDollItemSyncHandler.OnReceive;
EmojiHandler = new Handlers.EmojiHandler(); EmojiHandler = new Handlers.EmojiHandler();
GetDataHandlers.Emoji += EmojiHandler.OnReceive; GetDataHandlers.Emoji += EmojiHandler.OnReceive;
LandGolfBallInCupHandler = new Handlers.LandGolfBallInCupHandler(); LandGolfBallInCupHandler = new Handlers.LandGolfBallInCupHandler();
GetDataHandlers.LandGolfBallInCup += LandGolfBallInCupHandler.OnReceive; GetDataHandlers.LandGolfBallInCup += LandGolfBallInCupHandler.OnReceive;

6
TShockAPI/GetDataHandlers.cs
View file

@ -3791,13 +3791,13 @@ namespace TShockAPI
ushort stack = args.Data.ReadUInt16(); ushort stack = args.Data.ReadUInt16();
int prefix = args.Data.ReadByte(); int prefix = args.Data.ReadByte();
if (oldItem.type == 0 && newItem.type == 0)
return false;
newItem.SetDefaults(itemType); newItem.SetDefaults(itemType);
newItem.stack = stack; newItem.stack = stack;
newItem.Prefix(prefix); newItem.Prefix(prefix);
if (oldItem.type == 0 && newItem.type == 0)
return false;
if (OnDisplayDollItemSync(args.Player, args.Data, playerIndex, tileEntityID, displayDoll, slot, isDye, oldItem, newItem)) if (OnDisplayDollItemSync(args.Player, args.Data, playerIndex, tileEntityID, displayDoll, slot, isDye, oldItem, newItem))
return true; return true;
} }