Commit 485e265e authored by nanahira's avatar nanahira

Merge branch 'master' of https://github.com/IceYGO/windbot

parents eeb14bff bd858159
...@@ -143,10 +143,10 @@ namespace WindBot.Game ...@@ -143,10 +143,10 @@ namespace WindBot.Game
} }
if ((flag & (int)Query.Owner) != 0) if ((flag & (int)Query.Owner) != 0)
Owner = duel.GetLocalPlayer(packet.ReadInt32()); Owner = duel.GetLocalPlayer(packet.ReadInt32());
if ((flag & (int)Query.IsDisabled) != 0) if ((flag & (int)Query.Status) != 0) {
Disabled = packet.ReadInt32(); int status = packet.ReadInt32();
if ((flag & (int)Query.IsPublic) != 0) Disabled = status & 0x0001;
packet.ReadInt32(); }
if ((flag & (int)Query.LScale) != 0) if ((flag & (int)Query.LScale) != 0)
LScale = packet.ReadInt32(); LScale = packet.ReadInt32();
if ((flag & (int)Query.RScale) != 0) if ((flag & (int)Query.RScale) != 0)
......
...@@ -1050,6 +1050,10 @@ namespace WindBot.Game ...@@ -1050,6 +1050,10 @@ namespace WindBot.Game
int sseq = packet.ReadByte(); int sseq = packet.ReadByte();
int desc = packet.ReadInt32(); int desc = packet.ReadInt32();
if (desc == 221) // trigger effect
{
desc = 0;
}
cards.Add(_duel.GetCard(con, loc, seq, sseq)); cards.Add(_duel.GetCard(con, loc, seq, sseq));
descs.Add(desc); descs.Add(desc);
} }
......
No preview for this file type
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment