aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon
diff options
context:
space:
mode:
authorsyeyoung <cyong06@naver.com>2021-01-27 16:22:17 +0900
committersyeyoung <cyong06@naver.com>2021-01-27 16:22:17 +0900
commitb5cbefcccf5ae5b7d156b181c5cefdcee3861ab8 (patch)
tree0ef974639c88af69376bc2341a4ddc38ebccf38f /src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon
parent9c2057e53549b28f3e5ea38001a8ddf443154aa8 (diff)
downloadSkyblock-Dungeons-Guide-b5cbefcccf5ae5b7d156b181c5cefdcee3861ab8.tar.gz
Skyblock-Dungeons-Guide-b5cbefcccf5ae5b7d156b181c5cefdcee3861ab8.tar.bz2
Skyblock-Dungeons-Guide-b5cbefcccf5ae5b7d156b181c5cefdcee3861ab8.zip
asdasd
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon')
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java
index f2c20965..962f314d 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java
@@ -180,7 +180,7 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener,
Point pt2;
double yaw2;
- if (entityplayer != null) {
+ if (entityplayer != null && !entityplayer.isInvisible()) {
pt2 = mapProcessor.worldPointToMapPoint(entityplayer.getPositionEyes(partialTicks));
yaw2 = entityplayer.prevRotationYawHead + (entityplayer.rotationYawHead - entityplayer.prevRotationYawHead) * partialTicks;
} else {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java
index 60610b9d..e121b660 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonScore.java
@@ -138,12 +138,14 @@ public class FeatureDungeonScore extends GuiFeature {
int totalSecrets = 0;
int secrets = 0;
{
+ int completed = 0;
for (DungeonRoom dungeonRoom : context.getDungeonRoomList()) {
if (dungeonRoom.getTotalSecrets() != -1)
totalSecrets += dungeonRoom.getTotalSecrets();
else totalSecretsKnown = false;
+ completed += dungeonRoom.getUnitPoints().size();
}
- fullyCleared = getPercentage() == context.getDungeonRoomList().size() && context.getMapProcessor().getUndiscoveredRoom() == 0;
+ fullyCleared = completed >= getTotalRooms() && context.getMapProcessor().getUndiscoveredRoom() == 0;
explorer += MathHelper.clamp_int((int) Math.floor(6.0 / 10.0 * getPercentage()), 0, 60);
explorer += MathHelper.clamp_int((int) Math.floor(40 * ((secrets = FeatureRegistry.DUNGEON_SECRETS.getSecretsFound()) / (double)totalSecrets)),0,40);
}