Merge branch 'master' into AI_ATTACK_TIMEOUT

.github/workflows/snapshots-android.yml

@@ -8,11 +8,11 @@ on:
           description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
           required: false
           default: false
-        upload_package:
+        #upload_package:
-          type: boolean
+        #  type: boolean
-          description: 'Upload the completed Android package'
+        #  description: 'Upload the completed Android package'
-          required: false
+        #  required: false
-          default: true
+        #  default: true
   schedule:
     # * is a special character in YAML so you have to quote this string
     - cron:  '00 19 * * *'
@@ -93,6 +93,7 @@ jobs:
           mkdir upload
           mv /home/runner/work/forge/forge/forge-gui-android/target/*-signed-aligned.apk upload/
           mv /home/runner/work/forge/forge/forge-gui-android/target/assets.zip upload/
+          mv /home/runner/work/forge/forge/forge-gui-android/target/classes/assets/version.txt upload/
           cd upload
           ls
         env:
@@ -100,7 +101,7 @@ jobs:
 
       - name: 📂 Sync files
         uses: SamKirkland/FTP-Deploy-Action@v4.3.4
-        if: ${{ inputs.upload_package }}
+        #if: ${{ inputs.upload_package }}
         with:
           server: ftp.cardforge.org
           username: ${{ secrets.FTP_USERNAME }}

forge-gui/src/main/java/forge/gamemodes/match/input/InputQueue.java

@@ -56,7 +56,8 @@ public class InputQueue extends Observable {
 
         if (topMostInput != inp) {
             System.out.println("Cannot remove input " + inp.getClass().getSimpleName() + " because it's not on top of stack. Stack = " + inputStack );
-        } else {
+        } else if (topMostInput != null) {
+            // if topMostInput is null then it means the inputstack is already empty, why this is called twice?
            inputStack.pop();
         }
         updateObservers();