diff --git a/src/main/java/controller/DeckController.java b/src/main/java/controller/DeckController.java index 62a760ed..b7ac0b15 100644 --- a/src/main/java/controller/DeckController.java +++ b/src/main/java/controller/DeckController.java @@ -320,29 +320,23 @@ public void handle(DragEvent dragEvent) { if (bool) { mainDeckHashMap.put(rectangle, mainDeckHashMap.get(sourceRectangle)); mainDeckHashMap.remove(sourceRectangle); - deck.addCard(mainDeckHashMap.get(rectangle).getCardName(), false, - User.getUserByUsername(username)); - deck.deleteCard(mainDeckHashMap.get(rectangle).getCardName(), false); } else { mainDeckHashMap.put(rectangle, sideDeckHashMap.get(sourceRectangle)); sideDeckHashMap.remove(sourceRectangle); + deck.deleteCard(mainDeckHashMap.get(rectangle).getCardName(), true); deck.addCard(mainDeckHashMap.get(rectangle).getCardName(), false, User.getUserByUsername(username)); - deck.deleteCard(mainDeckHashMap.get(rectangle).getCardName(), true); } } else { if (bool) { sideDeckHashMap.put(rectangle, mainDeckHashMap.get(sourceRectangle)); mainDeckHashMap.remove(sourceRectangle); + deck.deleteCard(sideDeckHashMap.get(rectangle).getCardName(), false); deck.addCard(sideDeckHashMap.get(rectangle).getCardName(), true, User.getUserByUsername(username)); - deck.deleteCard(sideDeckHashMap.get(rectangle).getCardName(), false); } else { sideDeckHashMap.put(rectangle, sideDeckHashMap.get(sourceRectangle)); sideDeckHashMap.remove(sourceRectangle); - deck.addCard(sideDeckHashMap.get(rectangle).getCardName(), true, - User.getUserByUsername(username)); - deck.deleteCard(sideDeckHashMap.get(rectangle).getCardName(), true); } } sourceRectangle.setAccessibleText("null");