From c1e09c41ebd433ca801db45ba04828105e4b1cae Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 13 Jan 2020 15:07:20 +0100 Subject: [PATCH] Refactoring + implementation of dropNextActionsIfNecessary --- .../android/model/handhistory/Builder.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/Builder.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/Builder.kt index 5e7962f5..2e2f16b5 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/handhistory/Builder.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/Builder.kt @@ -143,9 +143,7 @@ class Builder { val computedAction = this.sortedActions.first { it.action.index == index } computedAction.action.type = actionType - dropIfNecessary(index) - - // remaining stack + effective amount + dropNextActionsIfNecessary(index) when (actionType) { Action.Type.CALL -> { @@ -164,8 +162,10 @@ class Builder { return computedAction.requireAmount } - private fun dropIfNecessary(index: Int) { - this.sortedActions.drop(index + 1) + private fun dropNextActionsIfNecessary(index: Int) { + if (index > this.handHistory.numberOfPlayers) { + this.sortedActions.drop(index + 1) + } } /***