From 73f8c2649a5b2e349809657759f514516f28ec95 Mon Sep 17 00:00:00 2001
From: DaanV2 <daanverstraten@hotmail.com>
Date: Wed, 10 Feb 2021 14:21:43 +0100
Subject: [PATCH] Fixing particle effects for resource_pack

---
 .../animations/1.10.0/actor_animation.json    | 20 +++------------
 .../animations/1.8.0/actor_animation.json     | 25 +++++++++++--------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/source/resource/animations/1.10.0/actor_animation.json b/source/resource/animations/1.10.0/actor_animation.json
index 3146dd88..e18f869b 100644
--- a/source/resource/animations/1.10.0/actor_animation.json
+++ b/source/resource/animations/1.10.0/actor_animation.json
@@ -319,28 +319,16 @@
             "title": "Particle effects",
             "description": "TODO",
             "oneOf": [
-              {
-                "$ref": "#/definitions/ParticleEffect"
-              },
+              { "$ref": "#/definitions/ParticleEffect" },
               {
                 "type": "object",
-                "propertyNames": {
-                  "pattern": "^[\\d.]+$"
-                },
+                "propertyNames": { "pattern": "^[\\d.]+$", "examples": ["0.0"] },
                 "additionalProperties": {
                   "title": "Timeline object",
                   "description": "A single point in time",
                   "oneOf": [
-                    {
-                      "type": "object",
-                      "$ref": "#/definitions/ParticleEffect"
-                    },
-                    {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/definitions/ParticleEffect"
-                      }
-                    }
+                    { "type": "object","$ref": "#/definitions/ParticleEffect" },
+                    { "type": "array", "items": { "$ref": "#/definitions/ParticleEffect" }}
                   ]
                 }
               }
diff --git a/source/resource/animations/1.8.0/actor_animation.json b/source/resource/animations/1.8.0/actor_animation.json
index 3d47407c..05b00974 100644
--- a/source/resource/animations/1.8.0/actor_animation.json
+++ b/source/resource/animations/1.8.0/actor_animation.json
@@ -317,16 +317,21 @@
           "particle_effects": {
             "title": "Particle effects",
             "description": "TODO",
-            "type": "object",
-            "propertyNames": {
-              "pattern": "^[\\d.]+$",
-              "examples": ["0.0", "1.0", "2.3"]
-            },
-            "additionalProperties": {
-              "title": "Timeline object",
-              "description": "A single point in time",
-              "$ref": "#/definitions/ParticleEffect"
-            }
+            "oneOf": [
+              { "$ref": "#/definitions/ParticleEffect" },
+              {
+                "type": "object",
+                "propertyNames": { "pattern": "^[\\d.]+$", "examples": ["0.0"] },
+                "additionalProperties": {
+                  "title": "Timeline object",
+                  "description": "A single point in time",
+                  "oneOf": [
+                    { "type": "object","$ref": "#/definitions/ParticleEffect" },
+                    { "type": "array", "items": { "$ref": "#/definitions/ParticleEffect" }}
+                  ]
+                }
+              }
+            ]
           },
           "start_delay": {
             "title": "Start delay",