fix BadPacketsF false flag

zimzaza4 · Sep 22, 2023 · ab0bece · ab0bece
1 parent 328b6a6
commit ab0bece
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsF.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsF.java
@@ -11,7 +11,7 @@
 @CheckData(name = "BadPacketsF")
 public class BadPacketsF extends Check implements PacketCheck {
     public boolean lastSprinting;
-    boolean thanksMojang; // Support 1.14+ clients starting on either true or false sprinting, we don't know
+    public boolean exemptNext = true; // Support 1.14+ clients starting on either true or false sprinting, we don't know
 
     public BadPacketsF(GrimPlayer player) {
         super(player);
@@ -24,8 +24,8 @@ public void onPacketReceive(PacketReceiveEvent event) {
 
             if (packet.getAction() == WrapperPlayClientEntityAction.Action.START_SPRINTING) {
                 if (lastSprinting) {
-                    if (!thanksMojang) {
-                        thanksMojang = true;
+                    if (exemptNext) {
+                        exemptNext = false;
                         return;
                     }
                     flagAndAlert();
@@ -34,8 +34,8 @@ public void onPacketReceive(PacketReceiveEvent event) {
                 lastSprinting = true;
             } else if (packet.getAction() == WrapperPlayClientEntityAction.Action.STOP_SPRINTING) {
                 if (!lastSprinting) {
-                    if (!thanksMojang) {
-                        thanksMojang = true;
+                    if (exemptNext) {
+                        exemptNext = false;
                         return;
                     }
                     flagAndAlert();

diff --git a/src/main/java/ac/grim/grimac/events/packets/PacketPlayerRespawn.java b/src/main/java/ac/grim/grimac/events/packets/PacketPlayerRespawn.java
@@ -104,6 +104,11 @@ public void onPacketSend(PacketSendEvent event) {
 
                 player.checkManager.getPacketCheck(BadPacketsE.class).handleRespawn(); // Reminder ticks reset
 
+                // compensate for immediate respawn gamerule
+                if (player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_15)) {
+                    player.checkManager.getPacketCheck(BadPacketsF.class).exemptNext = true;
+                }
+
                 // EVERYTHING gets reset on a cross dimensional teleport, clear chunks and entities!
                 if (respawn.getDimension().getId() != player.dimension.getId() || !Objects.equals(respawn.getDimension().getDimensionName(), player.dimension.getDimensionName()) || !Objects.equals(respawn.getDimension().getAttributes(), player.dimension.getAttributes())) {
                     player.compensatedEntities.entityMap.clear();
@@ -120,7 +125,7 @@ public void onPacketSend(PacketSendEvent event) {
 
                 if (player.getClientVersion().isOlderThan(ClientVersion.V_1_14)) { // 1.14+ players send a packet for this, listen for it instead
                     player.isSprinting = false;
-                    ((BadPacketsF) player.checkManager.getPacketCheck(BadPacketsF.class)).lastSprinting = false; // Pre 1.14 clients set this to false when creating new entity
+                    player.checkManager.getPacketCheck(BadPacketsF.class).lastSprinting = false; // Pre 1.14 clients set this to false when creating new entity
                     // TODO: What the fuck viaversion, why do you throw out keep all metadata?
                     // The server doesn't even use it... what do we do?
                     player.compensatedEntities.hasSprintingAttributeEnabled = false;