From a122152492e32a5ad5495c6f4dbf4a663aac0951 Mon Sep 17 00:00:00 2001
From: Andrew <libraryaddict115@yahoo.co.nz>
Date: Fri, 8 Nov 2013 05:57:48 +1300
Subject: [PATCH] Fix the misc disguise for falling block

---
 .../disguise/disguisetypes/MiscDisguise.java    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java b/src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
index 6b4c1e33..e3c2dadb 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java
@@ -14,6 +14,11 @@ public class MiscDisguise extends Disguise {
         this(disguiseType, replaceSounds, -1, -1);
     }
 
+    public MiscDisguise(DisguiseType disguiseType, boolean replaceSounds, int addictionalData) {
+        this(disguiseType, replaceSounds, (disguiseType == DisguiseType.FALLING_BLOCK ? addictionalData : -1),
+                (disguiseType == DisguiseType.FALLING_BLOCK ? -1 : addictionalData));
+    }
+
     public MiscDisguise(DisguiseType disguiseType, boolean replaceSounds, int id, int data) {
         switch (disguiseType) {
         // The only disguises which should use a custom data.
@@ -41,14 +46,6 @@ public class MiscDisguise extends Disguise {
         createDisguise(disguiseType, replaceSounds);
     }
 
-    public MiscDisguise(DisguiseType disguiseType, boolean replaceSounds, int addictionalData) {
-        this(disguiseType, replaceSounds, -1, addictionalData);
-    }
-
-    public int getId() {
-        return id;
-    }
-
     public MiscDisguise(DisguiseType disguiseType, int id, int data) {
         this(disguiseType, true, id, data);
     }
@@ -89,4 +86,8 @@ public class MiscDisguise extends Disguise {
         return data;
     }
 
+    public int getId() {
+        return id;
+    }
+
 }
\ No newline at end of file