fix: 可視性が一番低いもので上書きされる処理を削除 (#6)をrevert

This reverts commit e8875c4.
Toshimichi0915 · Aug 22, 2023 · 8e85d33 · 8e85d33
1 parent 15ee6c2
commit 8e85d33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.parallel=true
 # check these on https://fabricmc.net/develop
 minecraft_version=1.19.4
 yarn_mappings=1.19.4+build.2
-loader_version=0.14.21
+loader_version=0.14.19
 # Mod Properties
 maven_group=net.toshimichi
 archives_base_name=kze-plus

diff --git a/src/main/java/net/toshimichi/kzeplus/utils/KzeUtils.java b/src/main/java/net/toshimichi/kzeplus/utils/KzeUtils.java
@@ -72,11 +72,15 @@ public static VisibilityMode getVisibilityMode() {
         VisibilityMode mode = KzePlus.getInstance().getDefaultVisibility();
 
         if (player.isSneaking()) {
-            return options.getHideOnSneak();
-        } else if (player.isSprinting() || gameOptions.forwardKey.isPressed() && gameOptions.sprintKey.isPressed()) {
-            return options.getHideOnSprint();
-        } else {
-            return mode;
+            VisibilityMode candidate = options.getHideOnSneak();
+            if (candidate.ordinal() > mode.ordinal()) mode = candidate;
         }
+
+        if (player.isSprinting() || gameOptions.forwardKey.isPressed() && gameOptions.sprintKey.isPressed()) {
+            VisibilityMode candidate = options.getHideOnSprint();
+            if (candidate.ordinal() > mode.ordinal()) mode = candidate;
+        }
+
+        return mode;
     }
 }