Commit f70d488a authored by mercury233's avatar mercury233

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

parents 724c738b 28d2df35
......@@ -765,8 +765,8 @@ namespace WindBot.Game
private void InternalOnSelectUnselectCard(BinaryReader packet, Func<IList<ClientCard>, int, int, int, bool, IList<ClientCard>> func)
{
packet.ReadByte(); // player
packet.ReadByte(); // buttonok
bool cancelable = packet.ReadByte() != 0;
bool buttonok = packet.ReadByte() != 0;
bool cancelable = packet.ReadByte() != 0 || buttonok;
int min = packet.ReadByte();
int max = packet.ReadByte();
......@@ -799,7 +799,7 @@ namespace WindBot.Game
packet.ReadByte(); // pos
}
IList<ClientCard> selected = func(cards, min, max, _select_hint, cancelable);
IList<ClientCard> selected = func(cards, (cancelable && count2 > 0 ? 0 : 1), 1, _select_hint, cancelable);
_select_hint = 0;
if (selected.Count == 0 && cancelable)
......
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