-
Notifications
You must be signed in to change notification settings - Fork 335
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2c31868
commit fc1d341
Showing
2 changed files
with
66 additions
and
0 deletions.
There are no files selected for viewing
65 changes: 65 additions & 0 deletions
65
src/main/java/ac/grim/grimac/checks/impl/packetorder/PacketOrderK.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
package ac.grim.grimac.checks.impl.packetorder; | ||
|
||
import ac.grim.grimac.checks.Check; | ||
import ac.grim.grimac.checks.CheckData; | ||
import ac.grim.grimac.checks.type.PostPredictionCheck; | ||
import ac.grim.grimac.player.GrimPlayer; | ||
import ac.grim.grimac.utils.anticheat.update.PredictionComplete; | ||
import com.github.retrooper.packetevents.event.PacketReceiveEvent; | ||
import com.github.retrooper.packetevents.protocol.packettype.PacketType; | ||
import com.github.retrooper.packetevents.protocol.player.ClientVersion; | ||
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientInteractEntity; | ||
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPlayerFlying; | ||
|
||
import java.util.ArrayDeque; | ||
import java.util.ArrayList; | ||
|
||
@CheckData(name = "PacketOrderK", experimental = true) | ||
public class PacketOrderK extends Check implements PostPredictionCheck { | ||
public PacketOrderK(final GrimPlayer player) { | ||
super(player); | ||
} | ||
|
||
private final ArrayDeque<String> flags = new ArrayDeque<>(); | ||
private int lastEntity; | ||
private boolean hasInteracted = false; | ||
|
||
@Override | ||
public void onPacketReceive(PacketReceiveEvent event) { | ||
if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) { | ||
int entity = new WrapperPlayClientInteractEntity(event).getEntityId(); | ||
if (hasInteracted && entity != lastEntity) { | ||
String verbose = "lastEntity=" + lastEntity + ", entity=" + entity; | ||
if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) { | ||
if (flagAndAlert(verbose) && shouldModifyPackets()) { | ||
event.setCancelled(true); | ||
player.onPacketCancel(); | ||
} | ||
} else { | ||
flags.add(verbose); | ||
} | ||
} | ||
lastEntity = entity; | ||
hasInteracted = true; | ||
} | ||
|
||
if (WrapperPlayClientPlayerFlying.isFlying(event.getPacketType()) && player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8) && !player.packetStateData.lastPacketWasTeleport) { | ||
hasInteracted = false; | ||
} | ||
} | ||
|
||
@Override | ||
public void onPredictionComplete(PredictionComplete predictionComplete) { | ||
// we don't need to check pre-1.9 players here (no tick skipping) | ||
if (player.getClientVersion().isOlderThanOrEquals(ClientVersion.V_1_8)) return; | ||
|
||
if (!player.skippedTickInActualMovement) { | ||
for (String verbose : flags) { | ||
flagAndAlert(verbose); | ||
} | ||
} | ||
|
||
flags.clear(); | ||
hasInteracted = false; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters