fix OneLemonyBoi#159

wkangg · Aug 8, 2024 · 83ba266 · 83ba266
1 parent 2a2d910
commit 83ba266
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/main/java/onelemonyboi/miniutilities/misc/UnstableArmorHandler.java b/src/main/java/onelemonyboi/miniutilities/misc/UnstableArmorHandler.java
@@ -1,13 +1,20 @@
 package onelemonyboi.miniutilities.misc;
 
+import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraftforge.event.entity.living.LivingEquipmentChangeEvent;
 import onelemonyboi.miniutilities.items.MUArmorMaterial;
 
+import static onelemonyboi.miniutilities.renderer.AngelRingCheck.isEquipped;
+
 public class UnstableArmorHandler {
     public static void unstableArmor(LivingEquipmentChangeEvent event) {
         if (event.getEntity() instanceof Player player) {
+            EquipmentSlot slot = event.getSlot();
+            // if not armour slot, return
+            if (slot != EquipmentSlot.HEAD && slot != EquipmentSlot.CHEST && slot != EquipmentSlot.LEGS && slot != EquipmentSlot.FEET) return;
+
             long unstableCount = player.getInventory().armor.stream()
                     .filter(x -> x.getItem() instanceof ArmorItem)
                     .map(x -> (ArmorItem) x.getItem())
@@ -18,10 +25,14 @@ public static void unstableArmor(LivingEquipmentChangeEvent event) {
                 player.getAbilities().mayfly = true;
                 player.getAbilities().flying = true;
                 player.getAbilities().setWalkingSpeed(0.2f);
+
                 player.onUpdateAbilities();
             }
             else {
-                player.getAbilities().mayfly = false;
+                if (!player.isCreative() && !player.isSpectator() && !isEquipped(player)) {
+                    player.getAbilities().mayfly = false;
+                    player.getAbilities().flying = false;
+                }
                 player.getAbilities().setWalkingSpeed(0.1f);
                 player.onUpdateAbilities();
             }