From 6f9b2dfd6d8fcfa8e3664e46a42b063469c716bf Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Mon, 30 Nov 2020 03:05:13 +1300
Subject: [PATCH] Fix falling_block not being serializable

---
 .../disguise/utilities/DisguiseUtilities.java          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index 995b7534..104c1776 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -1223,6 +1223,7 @@ public class DisguiseUtilities {
         }
 
         GsonBuilder gsonBuilder = new GsonBuilder();
+
         gsonBuilder.disableHtmlEscaping();
 
         gsonBuilder.registerTypeAdapter(MetaIndex.class, new SerializerMetaIndex());
@@ -1232,13 +1233,14 @@ public class DisguiseUtilities {
         gsonBuilder.registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer());
         gsonBuilder.registerTypeHierarchyAdapter(ItemStack.class, new SerializerItemStack());
 
+        if (NmsVersion.v1_13.isSupported()) {
+            gsonBuilder.registerTypeHierarchyAdapter(BlockData.class, new SerializerBlockData());
+        }
+
+        // Gotta register all the flag watcher stuff before I make this one
         gsonBuilder.registerTypeAdapter(FlagWatcher.class, new SerializerFlagWatcher(gsonBuilder.create()));
         gsonBuilder.registerTypeAdapter(Disguise.class, new SerializerDisguise());
 
-        if (NmsVersion.v1_13.isSupported()) {
-            gsonBuilder.registerTypeAdapter(BlockData.class, new SerializerBlockData());
-        }
-
         gson = gsonBuilder.create();
 
         if (!profileCache.exists()) {