Skip to content

Commit 1b0864c

Browse files
committed
Restoring buff/debuff removall on death.
1 parent 175f37c commit 1b0864c

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

Zolian.Server.Base/GameScripts/Affects/DebuffAffects.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,8 +1575,22 @@ public override void OnEnded(Sprite affected, Debuff debuff)
15751575
switch (affected)
15761576
{
15771577
case Aisling aisling when !debuff.Cancelled:
1578+
foreach (var (_, value) in aisling.Debuffs)
1579+
{
1580+
if (!aisling.Debuffs.TryRemove(value.Name, out var debuffs)) continue;
1581+
debuffs.DeleteDebuff(aisling, value);
1582+
aisling.Client.SendEffect(byte.MinValue, value.Icon);
1583+
}
1584+
foreach (var (_, value) in aisling.Buffs)
1585+
{
1586+
if (!aisling.Buffs.TryRemove(value.Name, out var buffs)) continue;
1587+
buffs.DeleteBuff(aisling, value);
1588+
aisling.Client.SendEffect(byte.MinValue, value.Icon);
1589+
}
1590+
15781591
aisling.Client.SendServerMessage(ServerMessageType.OrangeBar1, "Your soul has been ripped from your mortal coil.");
15791592
aisling.SendTargetedClientMethod(PlayerScope.AislingsOnSameMap, client => client.SendSound(5, false));
1593+
15801594
aisling.PrepareForHell();
15811595
aisling.CastDeath();
15821596
aisling.Resting = Enums.RestPosition.Standing;

Zolian.Server.Base/Network/Server/WorldServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@ static ValueTask InnerOnUseItem(IWorldClient localClient, ItemUseArgs localArgs)
16521652

16531653
if (!activated) return default;
16541654
if (!item.Template.Flags.FlagIsSet(ItemFlags.Consumable)) return default;
1655-
if (item.Template.Name == "Chakra Stone" || item.Template.Name == "Cleric's Feather")
1655+
if (item.Template.Name is "Chakra Stone" or "Cleric's Feather")
16561656
{
16571657
localClient.SendServerMessage(ServerMessageType.ActiveMessage, "I can't use this in that way.");
16581658
return default;

0 commit comments

Comments
 (0)