PRE18.1

2 files changed, 8 insertions, 7 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalOverlay.java
index 9e97cfc0..b96fefef 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CrystalOverlay.java
@@ -144,7 +144,7 @@ public class CrystalOverlay {
         ItemStack held = p.getHeldItem();
         String internal = NotEnoughUpdates.INSTANCE.manager.getInternalNameForItem(held);
         if(internal != null) {
-            if(internal.endsWith("_CRYSTAL")) {
+            if(internal.endsWith("_CRYSTAL") && !internal.equals("POWER_CRYSTAL")) {
                 displayMillis = System.currentTimeMillis();
             }
         }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/FlyFix.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/FlyFix.java
index d33cb7d3..0fd2100c 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/FlyFix.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/FlyFix.java
@@ -13,8 +13,8 @@ public class FlyFix {
     private static long lastAbilitySend = 0;
 
     public static void onSendAbilities(C13PacketPlayerAbilities packet) {
-        //if(true) return;
-        if(!NotEnoughUpdates.INSTANCE.config.misc.flyFix) return;
+        if(true) return;
+        //if(!NotEnoughUpdates.INSTANCE.config.misc.flyFix) return;
         if(Minecraft.getMinecraft().thePlayer == null) return;
         if(!Minecraft.getMinecraft().thePlayer.capabilities.allowFlying) return;
         if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) return;
@@ -28,8 +28,8 @@ public class FlyFix {
     }
 
     public static void onReceiveAbilities(S39PacketPlayerAbilities packet) {
-        //if(true) return;
-        if(!NotEnoughUpdates.INSTANCE.config.misc.flyFix) return;
+        if(true) return;
+        //if(!NotEnoughUpdates.INSTANCE.config.misc.flyFix) return;
         if(Minecraft.getMinecraft().thePlayer == null) return;
         if(!Minecraft.getMinecraft().thePlayer.capabilities.allowFlying) return;
         if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) return;
@@ -39,6 +39,7 @@ public class FlyFix {
         long currentTime = System.currentTimeMillis();
 
         serverWantFly = packet.isFlying();
+
         if(serverWantFly != clientWantFly) {
             if(currentTime - lastAbilitySend > 0 && currentTime - lastAbilitySend < 500) {
                 packet.setFlying(clientWantFly);
@@ -49,8 +50,8 @@ public class FlyFix {
     }
 
     public static void tick() {
-        //if(true) return;
-        if(!NotEnoughUpdates.INSTANCE.config.misc.flyFix) return;
+        if(true) return;
+        //if(!NotEnoughUpdates.INSTANCE.config.misc.flyFix) return;
         if(Minecraft.getMinecraft().thePlayer == null) return;
         if(!Minecraft.getMinecraft().thePlayer.capabilities.allowFlying) return;
         if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) return;