- Added Grave Scrabbler

forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java

@@ -212,7 +212,7 @@ public class PlayEffect extends SpellAbilityEffect {
             } else if (sa.hasParam("PlayMadness")) {
                 Cost abCost = new Cost(sa.getParam("PlayMadness"), false);
                 tgtSA = tgtSA.copyWithDefinedCost(abCost);
-                tgtSA.setMadness(true);
+                tgtSA.getHostCard().setMadness(true);
             }
 
             if (tgtSA.usesTargeting() && !optional) {

forge-game/src/main/java/forge/game/card/Card.java

@@ -156,6 +156,7 @@ public class Card extends GameEntity implements Comparable<Card> {
     private boolean suspendCast = false;
     private boolean suspend = false;
     private boolean tributed = false;
+    private boolean madness = false;
 
     private boolean phasedOut = false;
     private boolean directlyPhasedOut = true;
@@ -5796,6 +5797,10 @@ public class Card extends GameEntity implements Comparable<Card> {
             if (this.tributed) {
                 return false;
             }
+        } else if (property.startsWith("madness")) {
+            if (!this.madness) {
+                return false;
+            }
         } else if (property.contains("Paired")) {
             if (property.contains("With")) { // PairedWith
                 if (!this.isPaired() || this.pairedWith != source) {
@@ -7903,6 +7908,15 @@ public class Card extends GameEntity implements Comparable<Card> {
         this.tributed = b;
     }
 
+    // Madness
+    public boolean isMadness() {
+        return madness;
+    }
+
+    public void setMadness(boolean madness) {
+        this.madness = madness;
+    }
+
     /**
      * <p>
      * Setter for the field <code>monstrous</code>.

forge-game/src/main/java/forge/game/spellability/SpellAbility.java

@@ -114,7 +114,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
     private List<Card> tappedForConvoke = new ArrayList<Card>();
     private Card sacrificedAsOffering = null;
     private int conspireInstances = 0;
-    private boolean madness = false;
 
     private HashMap<String, String> sVars = new HashMap<String, String>();
 
@@ -1721,15 +1720,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
         return this.conspireInstances;
     } // End of Conspire methods
 
-    // Madness
-    public boolean isMadness() {
-        return madness;
-    }
-
-    public void setMadness(boolean madness) {
-        this.madness = madness;
-    }
-
     public boolean isCumulativeupkeep() {
         return cumulativeupkeep;
     }