Commit 58387610 authored by mercury233's avatar mercury233

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

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