helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Suppress duplicate active effect notifications

Browse source 
Agent-Logs-Url: https://github.com/MCCTeam/Minecraft-Console-Client/sessions/8649d41a-e2aa-4fdd-aee8-96f4b35c9be0

Co-authored-by: milutinke <441903+milutinke@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-04-15 13:46:57 +00:00 • committed by GitHub
parent b445d2bdec
commit 443f4874df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

43
MinecraftClient/McClient.cs
View file

@ -741,7 +741,7 @@ namespace MinecraftClient
if (!playerEffects.Remove(effect, out var effectData))
continue;
ConsoleIO.WriteLine(string.Format(Translations.bot_effect_expired, effectData.GetDisplayName()));
AnnouncePlayerEffectExpired(effectData);
if (entities.TryGetValue(playerEntityID, out var playerEntity))
playerEntity.ActiveEffects.Remove(effect);
@ -3830,6 +3830,33 @@ namespace MinecraftClient
DispatchBotEvent(bot => bot.OnEntitySpawn(entity));
}
private static bool ShouldAnnouncePlayerEffectGain(EffectData effectData, EffectData? previousPlayerEffect)
{
if (!Config.Main.Advanced.ShowEffectMessages)
return false;
return previousPlayerEffect is null
|| previousPlayerEffect.IsExpired
|| previousPlayerEffect.Amplifier != effectData.Amplifier;
}
private static void AnnouncePlayerEffectGain(EffectData effectData)
{
if (!Config.Main.Advanced.ShowEffectMessages)
return;
ConsoleIO.WriteLine(string.Format(Translations.bot_effect_gained,
effectData.GetDisplayNameWithArticle(), effectData.GetInitialDurationText()));
}
private static void AnnouncePlayerEffectExpired(EffectData effectData)
{
if (!Config.Main.Advanced.ShowEffectMessages)
return;
ConsoleIO.WriteLine(string.Format(Translations.bot_effect_expired, effectData.GetDisplayName()));
}
/// <summary>
/// Called when an entity effects
/// </summary>
@ -3849,16 +3876,8 @@ namespace MinecraftClient
playerEffects.TryGetValue(effect, out var previousPlayerEffect);
playerEffects[effect] = effectData;
bool shouldAnnounceEffectGain = previousPlayerEffect is null
|| previousPlayerEffect.Amplifier != amplifier
|| (effectData.IsInfinite && !previousPlayerEffect.IsInfinite)
|| (!effectData.IsInfinite && duration > previousPlayerEffect.RemainingTicks + 20);
if (shouldAnnounceEffectGain)
{
ConsoleIO.WriteLine(string.Format(Translations.bot_effect_gained,
effectData.GetDisplayNameWithArticle(), effectData.GetInitialDurationText()));
}
if (ShouldAnnouncePlayerEffectGain(effectData, previousPlayerEffect))
AnnouncePlayerEffectGain(effectData);
}
if (entity is not null)
@ -3886,7 +3905,7 @@ namespace MinecraftClient
removedEffectData ??= playerEffectData;
if (entityid == playerEntityID && removedEffectData is not null)
ConsoleIO.WriteLine(string.Format(Translations.bot_effect_expired, removedEffectData.GetDisplayName()));
AnnouncePlayerEffectExpired(removedEffectData);
if (entity is not null)
DispatchBotEvent(bot => bot.OnRemoveEntityEffect(entity, effect));