diff --git a/katrain/core/sgf_parser.py b/katrain/core/sgf_parser.py index 2e9da2e..7f284a4 100644 --- a/katrain/core/sgf_parser.py +++ b/katrain/core/sgf_parser.py @@ -275,7 +275,7 @@ class SGFNode: @property def next_player(self): """Returns player to move""" - if "B" in self.properties or "AB" in self.properties: # root or black moved + if "B" in self.properties or ("AB" in self.properties and not "W" in self.properties): # root or black moved return "W" else: return "B" @@ -283,7 +283,7 @@ class SGFNode: @property def player(self): """Returns player that moved last. nb root is considered white played if no handicap stones are placed""" - if "B" in self.properties or "AB" in self.properties: + if "B" in self.properties or ("AB" in self.properties and not "W" in self.properties): return "B" else: return "W"