diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/trait/Commands.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/trait/Commands.java
index 888aa90ad..1098108b9 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/trait/Commands.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/trait/Commands.java
@@ -40,11 +40,15 @@ public class Commands {
         BossBarTrait trait = npc.getOrAddTrait(BossBarTrait.class);
         if (args.hasValueFlag("style")) {
             BarStyle style = Util.matchEnum(BarStyle.values(), args.getFlag("style"));
-            trait.setStyle(style);
+            if (style != null) {
+                trait.setStyle(style);
+            }
         }
         if (args.hasValueFlag("color")) {
             BarColor color = Util.matchEnum(BarColor.values(), args.getFlag("color"));
-            trait.setColor(color);
+            if (color != null) {
+                trait.setColor(color);
+            }
         }
         if (args.hasValueFlag("title")) {
             trait.setTitle(Colorizer.parseColors(args.getFlag("title")));
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/trait/Commands.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/trait/Commands.java
index 15c4b2932..f13c9348f 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/trait/Commands.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/trait/Commands.java
@@ -42,11 +42,15 @@ public class Commands {
         BossBarTrait trait = npc.getOrAddTrait(BossBarTrait.class);
         if (args.hasValueFlag("style")) {
             BarStyle style = Util.matchEnum(BarStyle.values(), args.getFlag("style"));
-            trait.setStyle(style);
+            if (style != null) {
+                trait.setStyle(style);
+            }
         }
         if (args.hasValueFlag("color")) {
             BarColor color = Util.matchEnum(BarColor.values(), args.getFlag("color"));
-            trait.setColor(color);
+            if (color != null) {
+                trait.setColor(color);
+            }
         }
         if (args.hasValueFlag("title")) {
             trait.setTitle(Colorizer.parseColors(args.getFlag("title")));
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/trait/Commands.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/trait/Commands.java
index 96739c916..a48aac444 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/trait/Commands.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/trait/Commands.java
@@ -44,11 +44,15 @@ public class Commands {
         BossBarTrait trait = npc.getOrAddTrait(BossBarTrait.class);
         if (args.hasValueFlag("style")) {
             BarStyle style = Util.matchEnum(BarStyle.values(), args.getFlag("style"));
-            trait.setStyle(style);
+            if (style != null) {
+                trait.setStyle(style);
+            }
         }
         if (args.hasValueFlag("color")) {
             BarColor color = Util.matchEnum(BarColor.values(), args.getFlag("color"));
-            trait.setColor(color);
+            if (color != null) {
+                trait.setColor(color);
+            }
         }
         if (args.hasValueFlag("title")) {
             trait.setTitle(Colorizer.parseColors(args.getFlag("title")));
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/Commands.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/Commands.java
index 274cfc7df..5723c86de 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/Commands.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/Commands.java
@@ -48,11 +48,15 @@ public class Commands {
         BossBarTrait trait = npc.getOrAddTrait(BossBarTrait.class);
         if (args.hasValueFlag("style")) {
             BarStyle style = Util.matchEnum(BarStyle.values(), args.getFlag("style"));
-            trait.setStyle(style);
+            if (style != null) {
+                trait.setStyle(style);
+            }
         }
         if (args.hasValueFlag("color")) {
             BarColor color = Util.matchEnum(BarColor.values(), args.getFlag("color"));
-            trait.setColor(color);
+            if (color != null) {
+                trait.setColor(color);
+            }
         }
         if (args.hasValueFlag("title")) {
             trait.setTitle(Colorizer.parseColors(args.getFlag("title")));
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/Commands.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/Commands.java
index 6b0e62256..af14ed2ce 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/Commands.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/Commands.java
@@ -61,11 +61,15 @@ public class Commands {
         BossBarTrait trait = npc.getOrAddTrait(BossBarTrait.class);
         if (args.hasValueFlag("style")) {
             BarStyle style = Util.matchEnum(BarStyle.values(), args.getFlag("style"));
-            trait.setStyle(style);
+            if (style != null) {
+                trait.setStyle(style);
+            }
         }
         if (args.hasValueFlag("color")) {
             BarColor color = Util.matchEnum(BarColor.values(), args.getFlag("color"));
-            trait.setColor(color);
+            if (color != null) {
+                trait.setColor(color);
+            }
         }
         if (args.hasValueFlag("title")) {
             trait.setTitle(Colorizer.parseColors(args.getFlag("title")));
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/trait/Commands.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/trait/Commands.java
index a7608ee1c..896f6a896 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/trait/Commands.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/trait/Commands.java
@@ -100,11 +100,15 @@ public class Commands {
         BossBarTrait trait = npc.getOrAddTrait(BossBarTrait.class);
         if (args.hasValueFlag("style")) {
             BarStyle style = Util.matchEnum(BarStyle.values(), args.getFlag("style"));
-            trait.setStyle(style);
+            if (style != null) {
+                trait.setStyle(style);
+            }
         }
         if (args.hasValueFlag("color")) {
             BarColor color = Util.matchEnum(BarColor.values(), args.getFlag("color"));
-            trait.setColor(color);
+            if (color != null) {
+                trait.setColor(color);
+            }
         }
         if (args.hasValueFlag("title")) {
             trait.setTitle(Colorizer.parseColors(args.getFlag("title")));
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java
index a4f589e41..46518cda1 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java
@@ -100,11 +100,15 @@ public class Commands {
         BossBarTrait trait = npc.getOrAddTrait(BossBarTrait.class);
         if (args.hasValueFlag("style")) {
             BarStyle style = Util.matchEnum(BarStyle.values(), args.getFlag("style"));
-            trait.setStyle(style);
+            if (style != null) {
+                trait.setStyle(style);
+            }
         }
         if (args.hasValueFlag("color")) {
             BarColor color = Util.matchEnum(BarColor.values(), args.getFlag("color"));
-            trait.setColor(color);
+            if (color != null) {
+                trait.setColor(color);
+            }
         }
         if (args.hasValueFlag("title")) {
             trait.setTitle(Colorizer.parseColors(args.getFlag("title")));
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/trait/Commands.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/trait/Commands.java
index 591c8b024..c60628840 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/trait/Commands.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/trait/Commands.java
@@ -136,11 +136,15 @@ public class Commands {
         BossBarTrait trait = npc.getOrAddTrait(BossBarTrait.class);
         if (args.hasValueFlag("style")) {
             BarStyle style = Util.matchEnum(BarStyle.values(), args.getFlag("style"));
-            trait.setStyle(style);
+            if (style != null) {
+                trait.setStyle(style);
+            }
         }
         if (args.hasValueFlag("color")) {
             BarColor color = Util.matchEnum(BarColor.values(), args.getFlag("color"));
-            trait.setColor(color);
+            if (color != null) {
+                trait.setColor(color);
+            }
         }
         if (args.hasValueFlag("title")) {
             trait.setTitle(Colorizer.parseColors(args.getFlag("title")));