Commit dc0a786e authored by nanahira's avatar nanahira

Merge branch 'master' into doom-pot

parents bd793917 d63f08d3
Pipeline #2861 passed with stage
in 1 minute and 14 seconds
...@@ -188,8 +188,8 @@ namespace WindBot.Game ...@@ -188,8 +188,8 @@ namespace WindBot.Game
int duel_rule = packet.ReadByte(); int duel_rule = packet.ReadByte();
_ai.Duel.IsNewRule = (duel_rule >= 4); _ai.Duel.IsNewRule = (duel_rule >= 4);
_ai.Duel.IsNewRule2020 = (duel_rule >= 5); _ai.Duel.IsNewRule2020 = (duel_rule >= 5);
BinaryWriter deck = buildUpdateDeck(pickDeckOnResult()); //BinaryWriter deck = buildUpdateDeck(pickDeckOnResult());
Connection.Send(deck); //Connection.Send(deck);
_ai.OnJoinGame(); _ai.OnJoinGame();
} }
...@@ -228,6 +228,8 @@ namespace WindBot.Game ...@@ -228,6 +228,8 @@ namespace WindBot.Game
_room.Position = pos; _room.Position = pos;
_room.IsHost = ((type >> 4) & 0xF) != 0; _room.IsHost = ((type >> 4) & 0xF) != 0;
_room.IsReady[pos] = true; _room.IsReady[pos] = true;
BinaryWriter deck = buildUpdateDeck(pickDeckOnResult());
Connection.Send(deck);
Connection.Send(CtosMessage.HsReady); Connection.Send(CtosMessage.HsReady);
} }
......
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