Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Null check /npc bossbar

This commit is contained in:
fullwall 2021-10-14 18:05:19 +08:00
parent 25f341ef63
commit 19c07ff1f5
8 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/trait/Commands.java
View File

@ -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")));

8
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/trait/Commands.java
View File

@ -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")));

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/trait/Commands.java
View File

@ -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")));

8
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/trait/Commands.java
View File

@ -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")));

8
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/trait/Commands.java
View File

@ -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")));

8
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/trait/Commands.java
View File

@ -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")));

8
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/trait/Commands.java
View File

@ -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")));

8
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/trait/Commands.java
View File

@ -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")));