scrap now only happens when scrap button is clicked

Cardshifter · Oct 6, 2014 · f565418 · f565418
1 parent d29b658
commit f565418
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...fter-fx/src/main/java/com/cardshifter/client/views/CardBattlefieldDocumentController.java b/...fter-fx/src/main/java/com/cardshifter/client/views/CardBattlefieldDocumentController.java
@@ -25,7 +25,6 @@ public final class CardBattlefieldDocumentController extends CardView implements
     @FXML private Label strength;
     @FXML private Label health;
     @FXML private Label cardId;
-    @FXML private Label cardType;
     @FXML private Label creatureType;
 	@FXML private Rectangle background;
 	@FXML private Circle sicknessCircle;
@@ -98,15 +97,15 @@ public void setCardAttackActive(UseableActionMessage message) {
 		this.message = message;
 		this.anchorPane.setOnMouseClicked(this::actionOnClick);
         background.setFill(Color.DARKGREEN);
-
 		this.setUpScrapButton();
 	}
 
     public void setCardActive(UseableActionMessage message) {
 		this.isActive = true;
 		this.message = message;
-		this.anchorPane.setOnMouseClicked(this::actionOnClick);
+		//this.anchorPane.setOnMouseClicked(this::actionOnClick);
         background.setFill(Color.YELLOW);
+		this.setUpScrapButton();
     }
 
 	public void removeCardActive() {