Decrease keepalive interval and autoupdate config (#27)

CASELOAD7000 · Oct 26, 2024 · ac5175b · ac5175b
1 parent 233a1e0
commit ac5175b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/common/src/main/java/me/caseload/knockbacksync/listener/PlayerJoinQuitListener.java b/common/src/main/java/me/caseload/knockbacksync/listener/PlayerJoinQuitListener.java
@@ -26,7 +26,7 @@ public void onPlayerQuit(UUID uuid) {
             return;
 
         if (playerData.isInCombat())
-            playerData.quitCombat(true);
+            playerData.quitCombat();
 
         PlayerDataManager.removePlayerData(uuid);
     }

diff --git a/...on/src/main/java/me/caseload/knockbacksync/listener/packetevents/PingReceiveListener.java b/...on/src/main/java/me/caseload/knockbacksync/listener/packetevents/PingReceiveListener.java
@@ -19,7 +19,7 @@
 import java.util.List;
 
 public class PingReceiveListener extends PacketListenerAbstract {
-// TODO supplement our own ping calculations with over keepalive sent by the server with
+
     @Override
     public void onPacketSend(PacketSendEvent event) {
         if (!Base.INSTANCE.getConfigManager().isToggled()) return;

diff --git a/common/src/main/java/me/caseload/knockbacksync/manager/ConfigManager.java b/common/src/main/java/me/caseload/knockbacksync/manager/ConfigManager.java
@@ -60,6 +60,8 @@ public void reloadConfig() {
         try {
             if (!configFile.exists()) {
                 Base.INSTANCE.saveDefaultConfig();
+            } else {
+                updateConfig();
             }
             yamlConfig.load();
             config = yamlConfig.getData();

diff --git a/common/src/main/java/me/caseload/knockbacksync/player/PlayerData.java b/common/src/main/java/me/caseload/knockbacksync/player/PlayerData.java
@@ -296,18 +296,16 @@ public void updateCombat() {
         CombatManager.addPlayer(uuid);
     }
 
-    public void quitCombat(boolean cancelTask) {
-        if (cancelTask)
-            combatTask.cancel();
-
+    public void quitCombat() {
+        combatTask.cancel(); // should do nothing
         combatTask = null;
         CombatManager.removePlayer(uuid);
     }
 
     @NotNull
     private AbstractTaskHandle newCombatTask() {
         return Base.INSTANCE.getScheduler().runTaskLaterAsynchronously(
-                () -> quitCombat(false), Base.INSTANCE.getConfigManager().getCombatTimer());
+                this::quitCombat, Base.INSTANCE.getConfigManager().getCombatTimer());
     }
 
     public ClientVersion getClientVersion() {

diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml
@@ -3,7 +3,7 @@
 #########################################
 
 # Do not modify!
-config_version: 3
+config_version: 4
 
 # Plugin enabled state
 # Toggleable using /knockbacksync toggle
@@ -18,7 +18,7 @@ notify_updates: true
 # Disabling this may lead to inaccuracies in calculations
 runnable:
   enabled: true       # Runnable enabled state
-  interval: 20         # The interval in ticks between sending out pings to players
+  interval: 5         # The interval in ticks between sending out pings to players
   combat_timer: 30    # The timer in ticks before being considered out of combat
 
 # The minimum change in ping required for it to be considered a lag spike.