diff options
| author | msg-programs <msgdoesstuff@gmail.com> | 2023-06-04 13:44:22 +0200 |
|---|---|---|
| committer | msg-programs <msgdoesstuff@gmail.com> | 2023-06-04 13:44:22 +0200 |
| commit | 9170e46f4166573fe837e2a7bdd2747854ab2921 (patch) | |
| tree | 1b81b1cd1d669e4156d37b98a2841394d936d51f /src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util | |
| parent | 34d87f0e435963cb571568a783c9c4456e811012 (diff) | |
| parent | 9d114a7be8ac358131441752db14d5356fc9fd3d (diff) | |
| download | Skyblocker-9170e46f4166573fe837e2a7bdd2747854ab2921.tar.gz Skyblocker-9170e46f4166573fe837e2a7bdd2747854ab2921.tar.bz2 Skyblocker-9170e46f4166573fe837e2a7bdd2747854ab2921.zip | |
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into skyhytab
# Conflicts:
# src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
# src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
# src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
# src/main/resources/skyblocker.mixins.json
Pull newest changes from upstream master
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerListMgr.java | 2 | ||||
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerListMgr.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerListMgr.java index b7784a2b..60915bc1 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerListMgr.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerListMgr.java @@ -29,7 +29,7 @@ public class PlayerListMgr { public static void updateList() { - if (!Utils.isOnSkyblock) { + if (!Utils.isOnSkyblock()) { return; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java index 134bfea8..d7abdfc2 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/util/PlayerLocator.java @@ -30,7 +30,7 @@ public class PlayerLocator { public static Location getPlayerLocation() { - if (!Utils.isOnSkyblock) { + if (!Utils.isOnSkyblock()) { return Location.UNKNOWN; } |