From 0a1f608a3ae6020c435b15eb2dfcafba0b655757 Mon Sep 17 00:00:00 2001 From: Patrikkk Date: Tue, 2 Jun 2020 11:59:24 +0200 Subject: [PATCH] Fix conflict resolve merge. Make project buildable. Had a duplicate HandleSyncRevengeMarker method. --- TShockAPI/Bouncer.cs | 2 +- TShockAPI/GetDataHandlers.cs | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index bfe270e0..f6de4c80 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -52,7 +52,7 @@ namespace TShockAPI GetDataHandlers.ReadNetModule += NetModuleHandler.OnReceive; EmojiHandler = new Handlers.EmojiHandler(); - GetDataHandlers.Emoji += EmojiHandler.OnReceiveEmoji; + GetDataHandlers.Emoji += EmojiHandler.OnReceive; LandGolfBallInCupHandler = new Handlers.LandGolfBallInCupHandler(); GetDataHandlers.LandGolfBallInCup += LandGolfBallInCupHandler.OnLandGolfBallInCup; diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 6a420ecd..cf13e396 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -3669,21 +3669,6 @@ namespace TShockAPI return false; } - private static bool HandleSyncRevengeMarker(GetDataHandlerArgs args) - { - int uniqueID = args.Data.ReadInt32(); - Vector2 location = args.Data.ReadVector2(); - int netId = args.Data.ReadInt32(); - float npcHpPercent = args.Data.ReadSingle(); - int npcTypeAgainstDiscouragement = args.Data.ReadInt32(); //tfw the argument is Type Against Discouragement - int npcAiStyleAgainstDiscouragement = args.Data.ReadInt32(); //see ^ - int coinsValue = args.Data.ReadInt32(); - float baseValue = args.Data.ReadSingle(); - bool spawnedFromStatus = args.Data.ReadBoolean(); - - return false; - } - private static bool HandleLandGolfBallInCup(GetDataHandlerArgs args) { byte playerIndex = args.Data.ReadInt8();