From f77c72491d0c2b3a9ccb5f407c27e536edaf608b Mon Sep 17 00:00:00 2001 From: Alex Gilbert Date: Tue, 16 Jan 2024 13:48:00 -0500 Subject: [PATCH] - Fixed debuff remover --- StardewArchipelago/Items/Traps/TrapManager.cs | 4 ++-- StardewArchipelago/ModEntry.cs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/StardewArchipelago/Items/Traps/TrapManager.cs b/StardewArchipelago/Items/Traps/TrapManager.cs index 78ee4cab7..90ea87ac4 100644 --- a/StardewArchipelago/Items/Traps/TrapManager.cs +++ b/StardewArchipelago/Items/Traps/TrapManager.cs @@ -161,7 +161,7 @@ private void AddFrozenDebuff() AddDebuff(Buffs.Frozen, duration); } - private void AddJinxedDebuff() + public void AddJinxedDebuff() { AddDebuff(Buffs.EvilEye); } @@ -604,7 +604,7 @@ private IEnumerable GetAllWateringCans() } // public void clearAllBuffs() - public bool ClearAllBuffs_ClearOtherBuffs_Prefix(BuffsDisplay __instance) + public static bool ClearAllBuffs_ClearOtherBuffs_Prefix(BuffsDisplay __instance) { try { diff --git a/StardewArchipelago/ModEntry.cs b/StardewArchipelago/ModEntry.cs index 8b84b5291..b12326df5 100644 --- a/StardewArchipelago/ModEntry.cs +++ b/StardewArchipelago/ModEntry.cs @@ -387,11 +387,6 @@ private void OnItemReceived() _itemManager?.ReceiveAllNewItems(true); } - private void DebugMethod(string arg1, string[] arg2) - { - _itemManager.ItemParser.TrapManager.ShuffleInventory(); - } - public bool ArchipelagoConnect(string ip, int port, string slot, string password, out string errorMessage) { var apConnection = new ArchipelagoConnectionInfo(ip, port, slot, null, password); @@ -471,5 +466,10 @@ private void OverrideTrapDifficulty(string arg1, string[] arg2) State.TrapDifficultyOverride = difficultyOverride; Monitor.Log($"Trap Difficulty set to [{difficultyOverride}]. Change will be saved next time you sleep", LogLevel.Info); } + + private void DebugMethod(string arg1, string[] arg2) + { + _itemManager.ItemParser.TrapManager.AddJinxedDebuff(); + } } }