Merge branch 'master' of github.com:wzdwc/TexasPokerGame

README.md

@@ -18,7 +18,7 @@ Detail: [client-readme](https://github.com/wzdwc/TexasPokerGame/tree/master/clie
 ```
 ## Demo
 See: [demo](http://www.jojgame.com)
-![img](https://github.com/wzdwc/TexasPokerGame/blob/master/gif/qrcode.jpg)
+![img](https://github.com/wzdwc/TexasPokerGame/blob/master/gif/qr.jpg)
 
 ![img](https://github.com/wzdwc/TexasPokerGame/blob/master/gif/demo1.gif)
 

SECURITY.md

@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.

server/src/app/core/PokerGame.ts

@@ -432,7 +432,11 @@ export class PokerGame {
     if (this.playerSize === 1
       && (this.currActionAllinPlayer.length === 0
         || (command === ECommand.ALL_IN
+<<<<<<< HEAD
           && this.prevSize <= nextPlayer.actionSize
+=======
+          && this.currPlayer.node.actionSize < nextPlayer.actionSize
+>>>>>>> 36eadbe76514757b8d5a5d3ebfff5cb1c7cb87e0
           && this.currPlayer.node.actionSize < this.prevSize))) {
       return true;
     }