Merge remote-tracking branch 'origin/master'

incubator-game/src/main/java/com/incubator/game/contest/Contest.java

@@ -783,7 +783,7 @@ public class Contest {
                         Player tmPlayer = this.actors.getOrDefault(settlementData.playerId, null);
                         if (tmPlayer != null) {
                             list.add(new Struct.PromotionData(tmPlayer.getId(), tmPlayer.data.avatarUrl,tmPlayer.data.name , tmPlayer.data.accumulatedPoints-10000,i,this.rooms.size() == 1));
-                            tmPlayer.data.matchPoints = settlementData.score;
+                            tmPlayer.data.matchPoints += tmPlayer.data.accumulatedPoints-10000;
                             tmPlayer.data.accumulatedPoints = 10000;
                             objects.add(tmPlayer);
                         }