diff --git a/API/API.iml b/API/API.iml
new file mode 100644
index 0000000..fa63d4b
--- /dev/null
+++ b/API/API.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+ SPIGOT
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyC.java b/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyC.java
index 84bb2ba..8dd82d3 100644
--- a/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyC.java
+++ b/src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyC.java
@@ -6,8 +6,14 @@ import dev.brighten.ac.check.CheckData;
import dev.brighten.ac.check.WAction;
import dev.brighten.ac.data.APlayer;
import dev.brighten.ac.packet.wrapper.in.WPacketPlayInFlying;
-import dev.brighten.ac.packet.wrapper.out.WPacketPlayOutEntityVelocity;
import dev.brighten.ac.utils.Async;
+import dev.brighten.ac.utils.MathUtils;
+import dev.brighten.ac.utils.MovementUtils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
@CheckData(name = "Fly (C)", checkId = "flyc", type = CheckType.MOVEMENT)
public class FlyC extends Check {
@@ -15,9 +21,48 @@ public class FlyC extends Check {
super(player);
}
- @Async
WAction flyingAction = packet -> {
- boolean ground = player.getMovement().getTo().isOnGround(),
+ if(player.getMovement().getLastTeleport().isNotPassed((1))
+ || player.getInfo().isGeneralCancel())
+ return;
+ final boolean ground = player.getMovement().getTo().isOnGround(),
fground = player.getMovement().getFrom().isOnGround();
+ final boolean jumped = fground && !ground && player.getMovement().getDeltaY() > 0;
+
+ final List possibleHeights = new ArrayList<>();
+
+ // Adding only possible jump height with current circumstances
+ possibleHeights.add(MovementUtils.getJumpHeight(player));
+
+ // Adding all possible velocity deltaY.
+ player.getVelocityHandler().getPossibleVectors().forEach(vec -> possibleHeights.add(vec.getY()));
+
+ jumpCheck: {
+ if(!jumped) break jumpCheck;
+
+ // We want to check all possible heights
+ for (Double possibleHeight : possibleHeights) {
+ double delta = MathUtils.getDelta(player.getMovement().getDeltaY(), possibleHeight);
+
+ if(delta < 1E-5) {
+ debug("Found delta: dy=%.5f, p=%.5f", player.getMovement().getDeltaY(), possibleHeight);
+ break jumpCheck;
+ }
+ }
+
+ // If we reach this point, it means no correct predicted deltaY was found
+ flag("dy=%.5f p[%s]", player.getMovement().getDeltaY(), possibleHeights.stream()
+ .map(s -> String.valueOf(MathUtils.round(s, 5))).collect(Collectors.joining(";")));
+ }
+
+ maximumHeightCheck: {
+ if(player.getInfo().nearGround) break maximumHeightCheck;
+
+ double maxHeight = possibleHeights.stream().max(Comparator.comparing(c -> c)).orElse(1.5) + 0.05f;
+
+ if(player.getMovement().getDeltaY() > maxHeight) {
+ flag("%.4f>-%.4f", player.getMovement().getDeltaY(), maxHeight);
+ }
+ }
};
}
diff --git a/src/main/java/dev/brighten/ac/check/impl/order/UseEntity.java b/src/main/java/dev/brighten/ac/check/impl/order/UseEntity.java
index f9ea54a..596bcce 100644
--- a/src/main/java/dev/brighten/ac/check/impl/order/UseEntity.java
+++ b/src/main/java/dev/brighten/ac/check/impl/order/UseEntity.java
@@ -25,6 +25,8 @@ public class UseEntity extends Check {
flag("delta=%s", timestamp - lastFlying);
}
} else if(buffer > 0) buffer--;
+
+ debug("delta=%s", timestamp - lastFlying);
};
WTimedAction flying = (packet, timestamp) -> {
diff --git a/src/main/java/dev/brighten/ac/data/APlayer.java b/src/main/java/dev/brighten/ac/data/APlayer.java
index 9dcff80..eb910d5 100644
--- a/src/main/java/dev/brighten/ac/data/APlayer.java
+++ b/src/main/java/dev/brighten/ac/data/APlayer.java
@@ -14,6 +14,7 @@ import dev.brighten.ac.messages.Messages;
import dev.brighten.ac.packet.ProtocolVersion;
import dev.brighten.ac.packet.handler.HandlerAbstract;
import dev.brighten.ac.utils.KLocation;
+import dev.brighten.ac.utils.RunUtils;
import dev.brighten.ac.utils.Tuple;
import dev.brighten.ac.utils.objects.evicting.EvictingList;
import dev.brighten.ac.utils.reflections.impl.MinecraftReflection;
@@ -115,7 +116,9 @@ public class APlayer {
Anticheat.INSTANCE.getScheduler().execute(() -> {
playerVersion = ProtocolVersion.getVersion(ProtocolAPI.INSTANCE.getPlayerVersion(getBukkitPlayer()));
- checkHandler.initChecks();
+ RunUtils.task(() -> {
+ checkHandler.initChecks();
+ });
});
// Enabling alerts for players on join if they have the permissions to
diff --git a/src/main/java/dev/brighten/ac/data/handlers/BlockInformation.java b/src/main/java/dev/brighten/ac/data/handlers/BlockInformation.java
index a0792e1..6e55b8f 100644
--- a/src/main/java/dev/brighten/ac/data/handlers/BlockInformation.java
+++ b/src/main/java/dev/brighten/ac/data/handlers/BlockInformation.java
@@ -235,8 +235,8 @@ public class BlockInformation {
if (blockBox.isCollided(box))
collidesVertically = true;
- if(groundBox.copy().expandMin(0, -0.8, 0).expand(0.4, 0, 0.4)
- .isCollided(blockBox))
+ if(groundBox.copy().expandMin(0, -0.8, 0)
+ .isIntersected(blockBox))
player.getInfo().setNearGround(true);
if(groundBox.isCollided(blockBox)) {
diff --git a/src/main/java/dev/brighten/ac/data/handlers/CheckHandler.java b/src/main/java/dev/brighten/ac/data/handlers/CheckHandler.java
index 3a61562..8329e52 100644
--- a/src/main/java/dev/brighten/ac/data/handlers/CheckHandler.java
+++ b/src/main/java/dev/brighten/ac/data/handlers/CheckHandler.java
@@ -62,7 +62,8 @@ public class CheckHandler {
for (Tuple> tuple : checkClass.getActions()) {
WAction action = tuple.one.get(check);
- if(!action.getClass().isAnnotationPresent(Async.class)) {
+ if(!tuple.one.getField().isAnnotationPresent(Async.class)) {
+ System.out.println("Adding sync event");
events.compute(tuple.two, (packetClass, array) -> {
if (array == null) {
return new ActionStore[] {new ActionStore(action, checkClass.getCheckClass().getParent())};
@@ -79,7 +80,8 @@ public class CheckHandler {
for (Tuple> tuple : checkClass.getActions()) {
WAction action = tuple.one.get(check);
- if(action.getClass().isAnnotationPresent(Async.class)) {
+ if(tuple.one.getField().isAnnotationPresent(Async.class)) {
+ System.out.println("Adding async event");
async_events.compute(tuple.two, (packetClass, array) -> {
if (array == null) {
return new ActionStore[] {new ActionStore(action, checkClass.getCheckClass().getParent())};
@@ -96,7 +98,8 @@ public class CheckHandler {
for (Tuple> tuple : checkClass.getTimedActions()) {
WTimedAction action = tuple.one.get(check);
- if(!action.getClass().isAnnotationPresent(Async.class)) {
+ if(!tuple.one.getField().isAnnotationPresent(Async.class)) {
+ System.out.println("Adding timed sync event");
eventsWithTimestamp.compute(tuple.two, (packetClass, array) -> {
if (array == null) {
return new TimedActionStore[] {new TimedActionStore(action, checkClass.getCheckClass().getParent())};
@@ -113,7 +116,8 @@ public class CheckHandler {
for (Tuple> tuple : checkClass.getTimedActions()) {
WTimedAction action = tuple.one.get(check);
- if(action.getClass().isAnnotationPresent(Async.class)) {
+ if(tuple.one.getField().isAnnotationPresent(Async.class)) {
+ System.out.println("Adding timed async event");
async_eventsWithTimestamp.compute(tuple.two, (packetClass, array) -> {
if (array == null) {
return new TimedActionStore[] {new TimedActionStore(action, checkClass.getCheckClass().getParent())};
@@ -127,10 +131,11 @@ public class CheckHandler {
}
}
synchronized (cancellableEvents) {
- for (Tuple> tuple : checkClass.getTimedActions()) {
+ for (Tuple> tuple : checkClass.getCancellableActions()) {
WCancellable action = tuple.one.get(check);
- if(!action.getClass().isAnnotationPresent(Async.class)) {
+ if(!tuple.one.getField().isAnnotationPresent(Async.class)) {
+ System.out.println("Adding cancel sync event");
cancellableEvents.compute(tuple.two, (packetClass, array) -> {
if (array == null) {
return new CancellableActionStore[] {new CancellableActionStore(action, checkClass.getCheckClass().getParent())};
@@ -172,9 +177,10 @@ public class CheckHandler {
//TODO When using WPacket wrappers only, make this strictly WPacket param based only
public void callPacket(Object packet, long timestamp) {
+ //System.out.println("Being called");
ThreadHandler.INSTANCE.getThread(player).getThread().execute(() -> {
if(async_events.containsKey(packet.getClass())) {
- synchronized (events) {
+ synchronized (async_events) {
ActionStore