Fixed edge case in update op level handling

Fixes #76
ViaVersion · Jul 26, 2024 · c87ec97 · c87ec97
1 parent a798479
commit c87ec97
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/...t/raphimc/vialegacy/protocol/classic/c0_28_30toa1_0_15/storage/ClassicOpLevelStorage.java b/...t/raphimc/vialegacy/protocol/classic/c0_28_30toa1_0_15/storage/ClassicOpLevelStorage.java
@@ -83,14 +83,12 @@ public void updateHax(final boolean flying, final boolean noClip, final boolean
     }
 
     public void setOpLevel(final byte opLevel) {
-        final boolean changed = this.opLevel != opLevel;
         this.opLevel = opLevel;
 
         if (this.haxEnabled) {
             final ClassicServerTitleStorage serverTitleStorage = this.getUser().get(ClassicServerTitleStorage.class);
-            this.updateHax(serverTitleStorage.isFlyEffectivelyEnabled(), serverTitleStorage.isNoclipEffectivelyEnabled(), serverTitleStorage.isSpeedEffectivelyEnabled(), serverTitleStorage.isRespawnEffectivelyEnabled());
-            if (changed) {
-                this.updateAbilities();
+            if (serverTitleStorage != null) { // Some servers update the op level before sending the login packet. Just ignore that because the op level is resent in the login packet.
+                this.updateHax(serverTitleStorage.isFlyEffectivelyEnabled(), serverTitleStorage.isNoclipEffectivelyEnabled(), serverTitleStorage.isSpeedEffectivelyEnabled(), serverTitleStorage.isRespawnEffectivelyEnabled());
             }
         }
     }