From b688405af3949dbb1655cebc651771a30458f442 Mon Sep 17 00:00:00 2001 From: DawnFire42 Date: Mon, 10 Aug 2026 12:07:42 -0400 Subject: [PATCH] Removed unnecessary check to prevent cards from moving to the same position --- cockatrice/src/game_graphics/zones/command_zone.cpp | 7 ------- cockatrice/src/game_graphics/zones/stack_zone.cpp | 7 ------- 2 files changed, 14 deletions(-) diff --git a/cockatrice/src/game_graphics/zones/command_zone.cpp b/cockatrice/src/game_graphics/zones/command_zone.cpp index 57106a756..c46005025 100644 --- a/cockatrice/src/game_graphics/zones/command_zone.cpp +++ b/cockatrice/src/game_graphics/zones/command_zone.cpp @@ -105,15 +105,8 @@ void CommandZone::handleDropEvent(const QList &dragItems, return; } - const auto &cards = getLogic()->getCards(); int index = calcDropIndexFromY(dropPoint.y(), MIN_CARD_VISIBLE); - // Same-zone no-op: don't move a card onto itself (index may equal size for append) - if (startZone == getLogic() && !cards.isEmpty() && - cards.at(qMin(index, static_cast(cards.size()) - 1))->getId() == dragItems.at(0)->getId()) { - return; - } - Command_MoveCard cmd; cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId()); cmd.set_start_zone(startZone->getName().toStdString()); diff --git a/cockatrice/src/game_graphics/zones/stack_zone.cpp b/cockatrice/src/game_graphics/zones/stack_zone.cpp index 4ecac8707..c22822421 100644 --- a/cockatrice/src/game_graphics/zones/stack_zone.cpp +++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp @@ -47,15 +47,8 @@ void StackZone::handleDropEvent(const QList &dragItems, return; } - const auto &cards = getLogic()->getCards(); int index = calcDropIndexFromY(dropPoint.y(), MIN_CARD_VISIBLE); - // Same-zone no-op: don't move a card onto itself (index may equal size for append) - if (startZone == getLogic() && !cards.isEmpty() && - cards.at(qMin(index, static_cast(cards.size()) - 1))->getId() == dragItems.at(0)->getId()) { - return; - } - Command_MoveCard cmd; cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId()); cmd.set_start_zone(startZone->getName().toStdString());