aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/skyblock
diff options
context:
space:
mode:
authormsg-programs <msgdoesstuff@gmail.com>2023-05-28 11:53:21 +0200
committermsg-programs <msgdoesstuff@gmail.com>2023-05-28 11:53:21 +0200
commit93147b4ab60fed4e5f6067ff6a6c638b0738cb71 (patch)
treee5a8b51f3a616724e50a3443ffd8a4261906e936 /src/main/java/me/xmrvizzy/skyblocker/skyblock
parent67eead9c88f7840990bee398c45f1567d358ed1b (diff)
downloadSkyblocker-93147b4ab60fed4e5f6067ff6a6c638b0738cb71.tar.gz
Skyblocker-93147b4ab60fed4e5f6067ff6a6c638b0738cb71.tar.bz2
Skyblocker-93147b4ab60fed4e5f6067ff6a6c638b0738cb71.zip
Handle dead players correctly in DungeonPlayerWidget
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java31
1 files changed, 20 insertions, 11 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java
index 8f28a2c6..c1f9e235 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java
@@ -8,6 +8,7 @@ import java.util.regex.Pattern;
import me.xmrvizzy.skyblocker.skyblock.tabhud.util.Ico;
import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr;
import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
import net.minecraft.item.ItemStack;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
@@ -68,23 +69,31 @@ public class DungeonPlayerWidget extends Widget {
this.addComponent(new IcoTextComponent(Ico.PLAYER, name));
String cl = m.group("class");
- Formatting clf = Formatting.GRAY;
- ItemStack cli = Ico.BARRIER;
- if (!cl.equals("EMPTY")) {
- cli = ICOS.get(cl);
- clf = Formatting.LIGHT_PURPLE;
- cl += " " + m.group("level");
+ String level = m.group("level");
+
+ if (level == null) {
+ PlainTextComponent ptc = new PlainTextComponent(
+ Text.literal("Player is dead").formatted(Formatting.RED));
+ this.addComponent(ptc);
+ } else {
+
+ Formatting clf = Formatting.GRAY;
+ ItemStack cli = Ico.BARRIER;
+ if (!cl.equals("EMPTY")) {
+ cli = ICOS.get(cl);
+ clf = Formatting.LIGHT_PURPLE;
+ cl += " " + m.group("level");
+ }
+
+ Text clazz = Text.literal("Class: ").append(Text.literal(cl).formatted(clf));
+ IcoTextComponent itclass = new IcoTextComponent(cli, clazz);
+ this.addComponent(itclass);
}
-
- Text clazz = Text.literal("Class: ").append(Text.literal(cl).formatted(clf));
- IcoTextComponent itclass = new IcoTextComponent(cli, clazz);
- this.addComponent(itclass);
}
this.addSimpleIcoText(Ico.CLOCK, "Ult Cooldown:", Formatting.GOLD, start + 1);
this.addSimpleIcoText(Ico.POTION, "Revives:", Formatting.DARK_PURPLE, start + 2);
this.pack();
-
}
}