Move config option check into handler

ViaVersion · Nov 6, 2024 · 7496901 · 7496901
1 parent 0125b0e
commit 7496901
Showing 1 changed file with 26 additions and 25 deletions.
diff --git a/...com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/EntityPacketRewriter1_19.java b/...com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/EntityPacketRewriter1_19.java
@@ -131,32 +131,33 @@ public void register() {
             }
         });
 
-        if (ViaBackwards.getConfig().mapDarknessEffect()) {
-            protocol.registerClientbound(ClientboundPackets1_19.REMOVE_MOB_EFFECT, new PacketHandlers() {
-                @Override
-                protected void register() {
-                    map(Types.VAR_INT); // Entity id
-                    map(Types.VAR_INT); // Effect id
-                    handler(wrapper -> {
-                        final int entityId = wrapper.get(Types.VAR_INT, 0);
-                        final int effectId = wrapper.get(Types.VAR_INT, 1);
-
-                        final EntityTracker1_19 tracker = tracker(wrapper.user());
-                        if (effectId == 33) { // Remove darkness and the fake blindness effect if the client doesn't have actual blindness
-                            tracker.getAffectedByDarkness().rem(entityId);
-                            if (!tracker.getAffectedByBlindness().contains(entityId)) {
-                                wrapper.set(Types.VAR_INT, 1, 15);
-                            }
-                        } else if (effectId == 15) { // Remove blindness and cancel if the client has darkness (will be removed by darkness removal)
-                            tracker.getAffectedByBlindness().rem(entityId);
-                            if (tracker.getAffectedByDarkness().contains(entityId)) {
-                                wrapper.cancel();
-                            }
+        protocol.registerClientbound(ClientboundPackets1_19.REMOVE_MOB_EFFECT, new PacketHandlers() {
+            @Override
+            protected void register() {
+                map(Types.VAR_INT); // Entity id
+                map(Types.VAR_INT); // Effect id
+                handler(wrapper -> {
+                    if (!ViaBackwards.getConfig().mapDarknessEffect()) {
+                        return;
+                    }
+                    final int entityId = wrapper.get(Types.VAR_INT, 0);
+                    final int effectId = wrapper.get(Types.VAR_INT, 1);
+
+                    final EntityTracker1_19 tracker = tracker(wrapper.user());
+                    if (effectId == 33) { // Remove darkness and the fake blindness effect if the client doesn't have actual blindness
+                        tracker.getAffectedByDarkness().rem(entityId);
+                        if (!tracker.getAffectedByBlindness().contains(entityId)) {
+                            wrapper.set(Types.VAR_INT, 1, 15);
                         }
-                    });
-                }
-            });
-        }
+                    } else if (effectId == 15) { // Remove blindness and cancel if the client has darkness (will be removed by darkness removal)
+                        tracker.getAffectedByBlindness().rem(entityId);
+                        if (tracker.getAffectedByDarkness().contains(entityId)) {
+                            wrapper.cancel();
+                        }
+                    }
+                });
+            }
+        });
 
         protocol.registerClientbound(ClientboundPackets1_19.LOGIN, new PacketHandlers() {
             @Override