aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
diff options
context:
space:
mode:
authorAlexey Krainev <xmrvizzy@ya.ru>2021-01-30 06:27:29 +0500
committerAlexey Krainev <xmrvizzy@ya.ru>2021-01-30 06:27:29 +0500
commitc26890daab1b6ccf5ac9b6c5c52f4127fc1fc891 (patch)
tree2450cc98f551b92440ae91593b36f951908c2744 /src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
parentb851d1148c19e6daf51ed5228491777f26040442 (diff)
downloadSkyblocker-c26890daab1b6ccf5ac9b6c5c52f4127fc1fc891.tar.gz
Skyblocker-c26890daab1b6ccf5ac9b6c5c52f4127fc1fc891.tar.bz2
Skyblocker-c26890daab1b6ccf5ac9b6c5c52f4127fc1fc891.zip
v1.0.4
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
index 7318bc3f..d9c20fde 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
@@ -9,6 +9,7 @@ import net.minecraft.scoreboard.Scoreboard;
import net.minecraft.scoreboard.ScoreboardObjective;
import net.minecraft.scoreboard.ScoreboardPlayerScore;
import net.minecraft.scoreboard.Team;
+import org.w3c.dom.Attr;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,6 +26,10 @@ public class Utils {
String[] sections = msg.split(" {3,}");
List<String> unused = new ArrayList<String>();
+ if (msg.contains("❤") && !msg.contains("❈") && sections.length == 2) {
+ Attribute.DEFENCE.set(0);
+ }
+
for (String section : sections) {
String clear = Pattern.compile("[^0-9 /]").matcher(section).replaceAll("").trim();
String[] split = clear.split("/");
@@ -35,7 +40,6 @@ public class Utils {
Attribute.MAX_HEALTH.set(Integer.parseInt(split[1]));
} else if (section.contains("❈")) {
Attribute.DEFENCE.set(Integer.parseInt(clear));
- unused.add(section);
} else if (section.contains("✎")) {
Attribute.MANA.set(Integer.parseInt(split[0]));
Attribute.MAX_MANA.set(Integer.parseInt(split[1]));
@@ -54,11 +58,14 @@ public class Utils {
if (sidebar.isEmpty()) return;
if (sidebar.get(sidebar.size() - 1).equals("www.hypixel.net")) {
- if (sidebar.get(0).equals("SKYBLOCK")) isSkyblock = true;
+ if (sidebar.get(0).contains("SKYBLOCK")) isSkyblock = true;
else isSkyblock = false;
if (isSkyblock && string.contains("The Catacombs")) isDungeons = true;
else isDungeons = false;
+ } else {
+ isSkyblock = false;
+ isDungeons = false;
}
}