playeffect: reorder special_data parsing for 1.16 compat

DenizenScript · Nov 26, 2021 · e56ae8c · e56ae8c
1 parent 9dfb3bb
commit e56ae8c
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java
@@ -284,6 +284,15 @@ else if (clazz == org.bukkit.Particle.DustOptions.class) {
                             dataObject = new org.bukkit.Particle.DustOptions(color.getColor(), size);
                         }
                     }
+                    else if (clazz == BlockData.class) {
+                        MaterialTag blockMaterial = MaterialTag.valueOf(special_data.asString(), scriptEntry.getContext());
+                        dataObject = blockMaterial.getModernData();
+                    }
+                    else if (clazz == ItemStack.class) {
+                        ItemTag itemType = ItemTag.valueOf(special_data.asString(), scriptEntry.getContext());
+                        dataObject = itemType.getItemStack();
+                    }
+                    // Intentionally list last due to requiring 1.17+
                     else if (clazz == org.bukkit.Particle.DustTransition.class) {
                         ListTag dataList = ListTag.valueOf(special_data.asString(), scriptEntry.getContext());
                         if (dataList.size() != 3) {
@@ -297,14 +306,6 @@ else if (clazz == org.bukkit.Particle.DustTransition.class) {
                             dataObject = new org.bukkit.Particle.DustTransition(fromColor.getColor(), toColor.getColor(), size);
                         }
                     }
-                    else if (clazz == BlockData.class) {
-                        MaterialTag blockMaterial = MaterialTag.valueOf(special_data.asString(), scriptEntry.getContext());
-                        dataObject = blockMaterial.getModernData();
-                    }
-                    else if (clazz == ItemStack.class) {
-                        ItemTag itemType = ItemTag.valueOf(special_data.asString(), scriptEntry.getContext());
-                        dataObject = itemType.getItemStack();
-                    }
                     else {
                         Debug.echoError("Unknown particle data type: " + clazz.getCanonicalName() + " for particle: " + particleEffect.getName());
                         return;