Skip to content

Commit 6253ac3

Browse files
committed
fix
1 parent 060d9e0 commit 6253ac3

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

TaleKit/Game/Event/Glacernon/GlacernonRaidOpenedEvent.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,10 @@
22

33
namespace TaleKit.Game.Event.Glacernon;
44

5-
public enum RaidKind
6-
{
7-
Morcos,
8-
Hatus,
9-
Calvina,
10-
Berios
11-
}
125

136
public class GlacernonRaidOpenedEvent : IEvent
147
{
158
public required Session Session { get; init; }
169
public required int TimeLeft { get; init; }
1710
public required GlacernonSide Side { get; init; }
18-
public required RaidKind RaidKind { get; init; }
1911
}

TaleKit/Network/Packet/Glacernon/Fc.cs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ protected override Fc CreatePacket(string[] body)
3636
AngelTime = body[4].ToInt(),
3737
DemonPercent = body[11].ToInt(),
3838
DemonEvent = body[12].ToInt(),
39-
DemonTime = body[13].ToInt(),
40-
IsMorcos = body[15] == "1",
41-
IsHatus = body[16] == "1",
42-
IsCalvina = body[17] == "1",
43-
IsBerios = body[18] == "1"
39+
DemonTime = body[13].ToInt()
4440
};
4541
}
4642
}
@@ -59,7 +55,7 @@ protected override void Process(Session session, Fc packet)
5955
});
6056
}
6157

62-
if (packet.AngelEvent == 2 || packet.DemonEvent == 2)
58+
if (packet.AngelEvent == 1 || packet.DemonEvent == 1)
6359
{
6460
session.Emit(new GlacernonMukrajuSpawnedEvent
6561
{
@@ -76,13 +72,6 @@ protected override void Process(Session session, Fc packet)
7672
Session = session,
7773
Side = packet.AngelEvent == 3 ? GlacernonSide.Angel : GlacernonSide.Demon,
7874
TimeLeft = packet.AngelEvent == 3 ? packet.AngelTime : packet.DemonTime,
79-
RaidKind = packet.IsMorcos
80-
? RaidKind.Morcos
81-
: packet.IsHatus
82-
? RaidKind.Hatus
83-
: packet.IsCalvina
84-
? RaidKind.Calvina
85-
: RaidKind.Berios
8675
});
8776
}
8877
}

0 commit comments

Comments
 (0)