Skip to content

Commit

Permalink
Fix PINK and SOLID bar colours/styles not applying properly
Browse files Browse the repository at this point in the history
  • Loading branch information
@2008Choco
2008Choco committed Aug 31, 2017
1 parent 5e424ee commit 643f87b
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 35 deletions.
14 changes: 7 additions & 7 deletions src/com/ninjaguild/dragoneggdrop/versions/v1_10/DragonBattle1_10_R1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ public boolean setBossBarStyle(BarStyle style, BarColor colour) {
if (battleServer == null) return false;

if (style != null) {
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "SOLID";
if (!EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
return false;
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "PROGRESS";
if (EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}

battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}
if (colour != null) battleServer.color = BossBattle.BarColor.valueOf(colour.name());
battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
if (colour != null) {
battleServer.color = BossBattle.BarColor.valueOf(colour.name());
}

battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
fieldBossBattleServer.setAccessible(false);
} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();
Expand Down
14 changes: 7 additions & 7 deletions src/com/ninjaguild/dragoneggdrop/versions/v1_11/DragonBattle1_11_R1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ public boolean setBossBarStyle(BarStyle style, BarColor colour) {
if (battleServer == null) return false;

if (style != null) {
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "SOLID";
if (!EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
return false;
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "PROGRESS";
if (EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}

battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}
if (colour != null) battleServer.color = BossBattle.BarColor.valueOf(colour.name());
battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
if (colour != null) {
battleServer.color = BossBattle.BarColor.valueOf(colour.name());
}

battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
fieldBossBattleServer.setAccessible(false);
} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();
Expand Down
14 changes: 7 additions & 7 deletions src/com/ninjaguild/dragoneggdrop/versions/v1_12/DragonBattle1_12_R1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ public boolean setBossBarStyle(BarStyle style, BarColor colour) {
if (battleServer == null) return false;

if (style != null) {
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "SOLID";
if (!EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
return false;
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "PROGRESS";
if (EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}

battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}
if (colour != null) battleServer.color = BossBattle.BarColor.valueOf(colour.name());
battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
if (colour != null) {
battleServer.color = BossBattle.BarColor.valueOf(colour.name());
}

battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
fieldBossBattleServer.setAccessible(false);
} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();
Expand Down
14 changes: 7 additions & 7 deletions src/com/ninjaguild/dragoneggdrop/versions/v1_9/DragonBattle1_9_R1.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ public boolean setBossBarStyle(BarStyle style, BarColor colour) {
if (battleServer == null) return false;

if (style != null) {
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "SOLID";
if (!EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
return false;
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "PROGRESS";
if (EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}

battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}
if (colour != null) battleServer.color = BossBattle.BarColor.valueOf(colour.name());
battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
if (colour != null) {
battleServer.color = BossBattle.BarColor.valueOf(colour.name());
}

battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
fieldBossBattleServer.setAccessible(false);
} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();
Expand Down
14 changes: 7 additions & 7 deletions src/com/ninjaguild/dragoneggdrop/versions/v1_9/DragonBattle1_9_R2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ public boolean setBossBarStyle(BarStyle style, BarColor colour) {
if (battleServer == null) return false;

if (style != null) {
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "SOLID";
if (!EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
return false;
String nmsStyle = style.name().contains("SEGMENTED") ? style.name().replace("SEGMENTED", "NOTCHED") : "PROGRESS";
if (EnumUtils.isValidEnum(BossBattle.BarStyle.class, nmsStyle)) {
battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}

battleServer.style = BossBattle.BarStyle.valueOf(nmsStyle);
}
if (colour != null) battleServer.color = BossBattle.BarColor.valueOf(colour.name());
battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
if (colour != null) {
battleServer.color = BossBattle.BarColor.valueOf(colour.name());
}

battleServer.sendUpdate(PacketPlayOutBoss.Action.UPDATE_STYLE);
fieldBossBattleServer.setAccessible(false);
} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();
Expand Down

0 comments on commit 643f87b

Please sign in to comment.