Fix an issue with flight flagging upon joining

Vrekt · Oct 7, 2021 · 0dfa816 · 0dfa816
1 parent 1fa0b8b
commit 0dfa816
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/src/main/java/me/vrekt/arc/Arc.java b/src/main/java/me/vrekt/arc/Arc.java
@@ -29,7 +29,7 @@ public final class Arc extends PluginBase {
     /**
      * IPL version
      */
-    public static final String VERSION_STRING = "1.7-824b-nukkit";
+    public static final String VERSION_STRING = "1.7.1-106a-nukkit";
 
     /**
      * The instance of this class

diff --git a/src/main/java/me/vrekt/arc/check/moving/Flight.java b/src/main/java/me/vrekt/arc/check/moving/Flight.java
@@ -184,6 +184,12 @@ private void checkVerticalMove(Player player, MovingData data, Location ground,
                     return;
                 }
 
+                // Check if player just joined.
+                // Players have an extreme vertical velocity when joining.
+                if (vertical >= 1.0 && (data.getPlayerJoinTime() == 0 || (System.currentTimeMillis() - data.getPlayerJoinTime() <= 1500))) {
+                    return; // ignore this result.
+                }
+
                 result.setFailed("Vertical move greater than max jump height.")
                         .withParameter("vertical", vertical)
                         .withParameter("max", maxJumpHeight);

diff --git a/src/main/java/me/vrekt/arc/data/moving/MovingData.java b/src/main/java/me/vrekt/arc/data/moving/MovingData.java
@@ -100,7 +100,7 @@ public static MovingData retrieveTemporary() {
      * The last moving update.
      */
     private long lastMovingUpdate;
-
+    private long playerJoinTime;
     /**
      * Total amount of move player packets
      */
@@ -657,5 +657,11 @@ public void setLastLowJumpBoost(long lastLowJumpBoost) {
         this.lastLowJumpBoost = lastLowJumpBoost;
     }
 
+    public long getPlayerJoinTime() {
+        return playerJoinTime;
+    }
 
+    public void setPlayerJoinTime(long playerJoinTime) {
+        this.playerJoinTime = playerJoinTime;
+    }
 }
diff --git a/src/main/java/me/vrekt/arc/exemption/ExemptionManager.java b/src/main/java/me/vrekt/arc/exemption/ExemptionManager.java
@@ -49,7 +49,6 @@ public void onPlayerJoin(Player player) {
      */
     private void doJoinExemptions(Player player) {
         // players will have an odd vertical upon joining, not sure why.
-        addExemption(player, CheckType.FLIGHT, 1000);
         addExemption(player, CheckType.MORE_PACKETS, 1000);
     }
 

diff --git a/src/main/java/me/vrekt/arc/listener/connection/PlayerConnectionListener.java b/src/main/java/me/vrekt/arc/listener/connection/PlayerConnectionListener.java
@@ -23,7 +23,9 @@ private void onPlayerJoin(PlayerJoinEvent event) {
         Arc.getInstance().getViolationManager().onPlayerJoin(player);
         Arc.getInstance().getExemptionManager().onPlayerJoin(player);
 
-        MovingAccess.calculateMovement(player, MovingData.get(player), player.getLocation(), player.getLocation());
+        final MovingData data = MovingData.get(player);
+        data.setPlayerJoinTime(System.currentTimeMillis());
+        MovingAccess.calculateMovement(player, data, player.getLocation(), player.getLocation());
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Arc
 main: me.vrekt.arc.Arc
-version: 1.7
+version: 1.7.1
 description: An anticheat for Nukkit.
 author: Vrekt
 api: ["1.0.0"]