From f3df122170181aacbe1561de3e298c309e69350f Mon Sep 17 00:00:00 2001
From: Scald <104459145+Arikatsu@users.noreply.github.com>
Date: Tue, 28 Nov 2023 23:22:48 +0530
Subject: [PATCH 1/2] Stop clogging my console dawg

---
 src/main/java/emu/lunarcore/Config.java              |  1 +
 .../java/emu/lunarcore/server/game/GameSession.java  | 12 ++++++++++++
 .../java/emu/lunarcore/server/packet/CmdIdUtils.java |  8 ++++++++
 3 files changed, 21 insertions(+)

diff --git a/src/main/java/emu/lunarcore/Config.java b/src/main/java/emu/lunarcore/Config.java
index 120de83..dd24aca 100644
--- a/src/main/java/emu/lunarcore/Config.java
+++ b/src/main/java/emu/lunarcore/Config.java
@@ -130,6 +130,7 @@ public class Config {
         public boolean commands = true;
         public boolean connections = true;
         public boolean packets = false;
+        public boolean loopPackets = false;
     }
     
     @Getter
diff --git a/src/main/java/emu/lunarcore/server/game/GameSession.java b/src/main/java/emu/lunarcore/server/game/GameSession.java
index ace957c..8e93910 100644
--- a/src/main/java/emu/lunarcore/server/game/GameSession.java
+++ b/src/main/java/emu/lunarcore/server/game/GameSession.java
@@ -127,6 +127,10 @@ public class GameSession {
 
                 // Log packet
                 if (LunarCore.getConfig().getLogOptions().packets) {
+                    if (LunarCore.getConfig().getLogOptions().loopPackets && CmdIdUtils.LOOP_PACKETS.contains(opcode)) {
+                        return;
+                    }
+                    
                     logPacket("RECV", opcode, data);
                 }
 
@@ -152,6 +156,10 @@ public class GameSession {
 
         // Log
         if (LunarCore.getConfig().getLogOptions().packets) {
+            if (LunarCore.getConfig().getLogOptions().loopPackets && CmdIdUtils.LOOP_PACKETS.contains(packet.getOpcode())) {
+                return;
+            }
+            
             logPacket("SEND", packet.getOpcode(), packet.getData());
         }
     }
@@ -167,6 +175,10 @@ public class GameSession {
             
             // Log
             if (LunarCore.getConfig().getLogOptions().packets) {
+                if (LunarCore.getConfig().getLogOptions().loopPackets && CmdIdUtils.LOOP_PACKETS.contains(cmdId)) {
+                    return;
+                }
+
                 logPacket("SEND", cmdId, null);
             }
         }
diff --git a/src/main/java/emu/lunarcore/server/packet/CmdIdUtils.java b/src/main/java/emu/lunarcore/server/packet/CmdIdUtils.java
index 1b0fac9..f993745 100644
--- a/src/main/java/emu/lunarcore/server/packet/CmdIdUtils.java
+++ b/src/main/java/emu/lunarcore/server/packet/CmdIdUtils.java
@@ -4,6 +4,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
@@ -14,6 +15,13 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public class CmdIdUtils {
+    public static final Set<Integer> LOOP_PACKETS = Set.of(
+        CmdId.PlayerHeartBeatCsReq,
+        CmdId.PlayerHeartBeatScRsp,
+        CmdId.SceneEntityMoveCsReq,
+        CmdId.SceneEntityMoveScRsp
+    );
+
     private static Int2ObjectMap<String> opcodeMap;
 
     static {

From c713cf049da1570a37903b364dd3c0440f521350 Mon Sep 17 00:00:00 2001
From: Scald <104459145+Arikatsu@users.noreply.github.com>
Date: Tue, 28 Nov 2023 23:42:31 +0530
Subject: [PATCH 2/2] Rename `loopPackets` to `filterLoopingPackets`

---
 src/main/java/emu/lunarcore/Config.java                  | 2 +-
 src/main/java/emu/lunarcore/server/game/GameSession.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/emu/lunarcore/Config.java b/src/main/java/emu/lunarcore/Config.java
index dd24aca..703321e 100644
--- a/src/main/java/emu/lunarcore/Config.java
+++ b/src/main/java/emu/lunarcore/Config.java
@@ -130,7 +130,7 @@ public class Config {
         public boolean commands = true;
         public boolean connections = true;
         public boolean packets = false;
-        public boolean loopPackets = false;
+        public boolean filterLoopingPackets = false;
     }
     
     @Getter
diff --git a/src/main/java/emu/lunarcore/server/game/GameSession.java b/src/main/java/emu/lunarcore/server/game/GameSession.java
index 8e93910..33b289b 100644
--- a/src/main/java/emu/lunarcore/server/game/GameSession.java
+++ b/src/main/java/emu/lunarcore/server/game/GameSession.java
@@ -127,7 +127,7 @@ public class GameSession {
 
                 // Log packet
                 if (LunarCore.getConfig().getLogOptions().packets) {
-                    if (LunarCore.getConfig().getLogOptions().loopPackets && CmdIdUtils.LOOP_PACKETS.contains(opcode)) {
+                    if (LunarCore.getConfig().getLogOptions().filterLoopingPackets && CmdIdUtils.LOOP_PACKETS.contains(opcode)) {
                         return;
                     }
                     
@@ -156,7 +156,7 @@ public class GameSession {
 
         // Log
         if (LunarCore.getConfig().getLogOptions().packets) {
-            if (LunarCore.getConfig().getLogOptions().loopPackets && CmdIdUtils.LOOP_PACKETS.contains(packet.getOpcode())) {
+            if (LunarCore.getConfig().getLogOptions().filterLoopingPackets && CmdIdUtils.LOOP_PACKETS.contains(packet.getOpcode())) {
                 return;
             }
             
@@ -175,7 +175,7 @@ public class GameSession {
             
             // Log
             if (LunarCore.getConfig().getLogOptions().packets) {
-                if (LunarCore.getConfig().getLogOptions().loopPackets && CmdIdUtils.LOOP_PACKETS.contains(cmdId)) {
+                if (LunarCore.getConfig().getLogOptions().filterLoopingPackets && CmdIdUtils.LOOP_PACKETS.contains(cmdId)) {
                     return;
                 }