From 225d9cbedb04a2911b568aa92b4155710a741da0 Mon Sep 17 00:00:00 2001
From: Chr1Z93 <puls.christian@gmail.com>
Date: Thu, 21 Nov 2024 00:20:35 +0100
Subject: [PATCH] Fixed picking a card up while it is falling

---
 src/core/Global.ttslua | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua
index 7a03aa07..2bf26eac 100644
--- a/src/core/Global.ttslua
+++ b/src/core/Global.ttslua
@@ -2877,12 +2877,9 @@ function moveCardWithTokens(params)
   Wait.condition(
     function() stopTokenTransformUpdating(card) end,
     function()
-      if card.held_by_color ~= nil then return true end
-
       if card ~= nil and cardTokens[card] ~= nil and #cardTokens[card] ~= 0 then
         updateTokenTransform(card)
-        local cardVelocity = card.getVelocity():magnitude()
-        return (card.resting and not card.isSmoothMoving()) or (cardVelocity < 0.15 and cardVelocity > 0.05)
+        return card.resting and not card.isSmoothMoving()
       end
 
       return true
@@ -2891,10 +2888,6 @@ function moveCardWithTokens(params)
 end
 
 function storeTokenTransform(card)
-  if cardTokens[card] ~= nil then
-    stopTokenTransformUpdating(card)
-  end
-
   cardTokens[card] = {}
   local cardRot = card.getRotation()
   for _, token in ipairs(searchLib.onObject(card, "isTileOrToken", 0.95)) do