funkemunky/KauriV3-mirror
1
0
Fork 0
mirror of https://github.com/funkemunky/KauriV3.git synced 2026-07-01 02:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing precision issues, fixing falses in Horizontal and Vertical, temp remove Phase, optimizations

Browse Source
This commit is contained in:
Dawson
2022-09-21 16:49:00 -04:00
parent 8ec28f2166
commit f463cda029
8 changed files with 114 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/dev/brighten/ac/check/Check.java
+47 -46
View File
@@ -5,7 +5,6 @@ import dev.brighten.ac.api.AnticheatAPI;
import dev.brighten.ac.api.check.CheckType;
import dev.brighten.ac.api.check.ECheck;
import dev.brighten.ac.api.event.AnticheatEvent;
import dev.brighten.ac.api.event.result.CancelResult;
import dev.brighten.ac.api.event.result.FlagResult;
import dev.brighten.ac.api.event.result.PunishResult;
import dev.brighten.ac.data.APlayer;
@@ -18,7 +17,6 @@ import lombok.val;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.*;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -85,6 +83,7 @@ public class Check implements ECheck {
}
public void cancel() {
/*
CancelResult result = CancelResult.builder().cancelled(false).build();
for (AnticheatEvent event : AnticheatAPI.INSTANCE.getAllEvents()) {
@@ -105,7 +104,7 @@ public class Check implements ECheck {
.toLocation(player.getBukkitPlayer().getWorld()), 10);
player.getBukkitPlayer().teleport(ground);
}
}*/
}
public void debug(String information, Object... variables) {
@@ -164,62 +163,64 @@ public class Check implements ECheck {
if(System.currentTimeMillis() - lastFlagRun < 50L) return;
lastFlagRun = System.currentTimeMillis();
if(Anticheat.INSTANCE.getTps() < 18)
vl = 0;
Anticheat.INSTANCE.getScheduler().execute(() -> {
if(Anticheat.INSTANCE.getTps() < 18)
vl = 0;
final String info = String.format(information, variables);
final String info = String.format(information, variables);
FlagResult currentResult = FlagResult.builder().cancelled(false).build();
FlagResult currentResult = FlagResult.builder().cancelled(false).build();
for (AnticheatEvent event : AnticheatAPI.INSTANCE.getAllEvents()) {
currentResult = event.onFlag(player.getBukkitPlayer(), this, info,
currentResult.isCancelled());
}
for (AnticheatEvent event : AnticheatAPI.INSTANCE.getAllEvents()) {
currentResult = event.onFlag(player.getBukkitPlayer(), this, info,
currentResult.isCancelled());
}
if(currentResult.isCancelled()) return;
if(currentResult.isCancelled()) return;
Anticheat.INSTANCE.getLogManager()
.insertLog(player, checkData, vl, System.currentTimeMillis(), info);
Anticheat.INSTANCE.getLogManager()
.insertLog(player, checkData, vl, System.currentTimeMillis(), info);
if(alertCountReset.isPassed(20)) {
alertCount.set(0);
alertCountReset.reset();
}
if(alertCountReset.isPassed(20)) {
alertCount.set(0);
alertCountReset.reset();
}
if(alertCount.incrementAndGet() < 40) {
boolean dev = Anticheat.INSTANCE.getTps() < 18;
if(alertCount.incrementAndGet() < 40) {
boolean dev = Anticheat.INSTANCE.getTps() < 18;
//Sending Discord webhook alert
//Sending Discord webhook alert
List<BaseComponent> toSend = new ArrayList<>();
List<BaseComponent> toSend = new ArrayList<>();
for (TextComponent tc : components) {
TextComponent ntc = new TextComponent(tc);
ntc.setText(formatAlert(tc.getText(), info));
for (TextComponent tc : components) {
TextComponent ntc = new TextComponent(tc);
ntc.setText(formatAlert(tc.getText(), info));
ntc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Description:")
.color(ChatColor.YELLOW)
.append(formatAlert(" %desc%\n", info)).color(ChatColor.WHITE).append("Info:")
.color(ChatColor.YELLOW)
.append(formatAlert(" %info%\n", info)).color(ChatColor.WHITE)
.append("\n").append("Click to teleport to player")
.create()));
ntc.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND,
addPlaceHolders(CheckConfig.clickCommand)));
ntc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Description:")
.color(ChatColor.YELLOW)
.append(formatAlert(" %desc%\n", info)).color(ChatColor.WHITE).append("Info:")
.color(ChatColor.YELLOW)
.append(formatAlert(" %info%\n", info)).color(ChatColor.WHITE)
.append("\n").append("Click to teleport to player")
.create()));
ntc.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND,
addPlaceHolders(CheckConfig.clickCommand)));
toSend.add(ntc);
}
toSend.add(ntc);
}
for (UUID uuid : alertsEnabled) {
Anticheat.INSTANCE.getPlayerRegistry().getPlayer(uuid)
.ifPresent(apl -> apl.getBukkitPlayer().spigot().sendMessage(toSend
.toArray(new BaseComponent[0])));
}
alertCountReset.reset();
}
if(punish && vl >= punishVl) {
punish();
}
for (UUID uuid : alertsEnabled) {
Anticheat.INSTANCE.getPlayerRegistry().getPlayer(uuid)
.ifPresent(apl -> apl.getBukkitPlayer().spigot().sendMessage(toSend
.toArray(new BaseComponent[0])));
}
alertCountReset.reset();
}
if(punish && vl >= punishVl) {
punish();
}
});
}
public void punish() {
src/main/java/dev/brighten/ac/check/impl/movement/Phase.java
-3
View File
@@ -1,8 +1,6 @@
package dev.brighten.ac.check.impl.movement;
import dev.brighten.ac.api.check.CheckType;
import dev.brighten.ac.check.Check;
import dev.brighten.ac.check.CheckData;
import dev.brighten.ac.check.WTimedAction;
import dev.brighten.ac.data.APlayer;
import dev.brighten.ac.packet.ProtocolVersion;
@@ -21,7 +19,6 @@ import org.bukkit.util.Vector;
import java.util.*;
@CheckData(name = "Phase", checkId = "phase", type = CheckType.MOVEMENT)
public class Phase extends Check {
private static final Set<Material> allowedMaterials = EnumSet.noneOf(Material.class);
src/main/java/dev/brighten/ac/check/impl/movement/fly/FlyA.java
+2 -1
View File
@@ -57,11 +57,12 @@ public class FlyA extends Check {
}
}
if(ProtocolVersion.getGameVersion().isBelow(ProtocolVersion.V1_9)) {
if(player.getPlayerVersion().isBelow(ProtocolVersion.V1_9)) {
if(Math.abs(predicted) < 0.005)
predicted = 0;
} else if(Math.abs(predicted) < 0.003) {
predicted = 0;
debug("Setting y to 0");
}
double deltaPredict = MathUtils.getDelta(player.getMovement().getDeltaY(), predicted);
src/main/java/dev/brighten/ac/check/impl/movement/speed/Horizontal.java
+59 -30
View File
@@ -15,6 +15,7 @@ import lombok.AllArgsConstructor;
import lombok.val;
import org.bukkit.Material;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
import java.util.ArrayList;
import java.util.Deque;
@@ -22,12 +23,13 @@ import java.util.List;
@CheckData(name = "Horizontal", checkId = "horizontala", type = CheckType.MOVEMENT)
public class Horizontal extends Check {
private boolean lastLastClientGround;
private boolean lastLastClientGround, stepped;
private float buffer, vbuffer;
private boolean maybeSkippedPos;
private int lastFlying;
private KLocation previousFrom;
private Vector motionX = new Vector(0,0,0);
private static final boolean[] TRUE_FALSE = new boolean[]{true, false};
public double strafe, forward;
@@ -47,6 +49,7 @@ public class Horizontal extends Check {
|| player.getInfo().isGeneralCancel()
|| player.getBlockInfo().onClimbable
|| player.getInfo().lastLiquid.isNotPassed(2)) {
motionX = new Vector(player.getMovement().getDeltaX(), player.getMovement().getDeltaY(), player.getMovement().getDeltaZ());
break check;
}
@@ -57,6 +60,8 @@ public class Horizontal extends Check {
List<Iteration> iterations = getIteration();
boolean found = false;
double precision = getPrecision();
TagsBuilder tags = null;
for (Iteration it : iterations) {
TagsBuilder tagsBuilder = new TagsBuilder();
@@ -88,9 +93,9 @@ public class Horizontal extends Check {
double aiMoveSpeed = player.getBukkitPlayer().getWalkSpeed() / 2;
float drag = 0.91f;
double lmotionX = player.getMovement().getLDeltaX(),
lmotionY = player.getMovement().getLDeltaY(),
lmotionZ = player.getMovement().getLDeltaZ();
double lmotionX = motionX.getX(),
lmotionY = motionX.getY(),
lmotionZ = motionX.getZ();
lmotionY-= 0.08;
lmotionY*= 0.98f;
@@ -229,7 +234,7 @@ public class Horizontal extends Check {
}
}
if(Math.abs(lmotionY) < (ProtocolVersion.getGameVersion().isBelow(ProtocolVersion.V1_9) ? 0.005 : 0.003)) {
if(Math.abs(lmotionY) < (player.getPlayerVersion().isBelow(ProtocolVersion.V1_9) ? 0.005 : 0.003)) {
lmotionY = 0;
}
@@ -240,10 +245,10 @@ public class Horizontal extends Check {
double d6;
// 1.9+ changes from 0.05 to 0.03
double protocolOffset = 0.05D;
double protocolOffset = player.getPlayerVersion().isBelow(ProtocolVersion.V1_9) ? 0.05D : 0.03D;
for (d6 = protocolOffset; lmotionX != 0.0D && Helper.getCollisions
(player.getBukkitPlayer().getWorld(), box.copy()
for (d6 = protocolOffset; lmotionX != 0.0D && Helper.blockCollisions(
player.getBlockInfo().blocks, box.copy()
.offset(lmotionX, 0 ,0), Materials.SOLID).isEmpty(); originalX = lmotionX) {
if (lmotionX < d6 && lmotionX >= -d6) {
lmotionX = 0.0D;
@@ -254,8 +259,8 @@ public class Horizontal extends Check {
}
}
for (; lmotionZ != 0.0D && Helper.getCollisions
(player.getBukkitPlayer().getWorld(), box.copy()
for (; lmotionZ != 0.0D && Helper.blockCollisions(
player.getBlockInfo().blocks, box.copy()
.offset(0, 0 ,lmotionZ), Materials.SOLID).isEmpty(); originalZ = lmotionZ) {
if (lmotionZ < d6 && lmotionZ >= -d6) {
lmotionZ = 0.0D;
@@ -266,8 +271,8 @@ public class Horizontal extends Check {
}
}
for (; lmotionX != 0.0D && lmotionZ != 0.0D && Helper.getCollisions
(player.getBukkitPlayer().getWorld(), box.copy()
for (; lmotionX != 0.0D && lmotionZ != 0.0D && Helper.blockCollisions
(player.getBlockInfo().blocks, box.copy()
.offset(lmotionX, -1.0 ,lmotionZ), Materials.SOLID).isEmpty();
originalZ = lmotionZ) {
if (lmotionX < d6 && lmotionX >= -d6) {
@@ -291,14 +296,18 @@ public class Horizontal extends Check {
tagsBuilder.addTag("sneak-edge");
}
List<SimpleCollisionBox> collisionBoxes = Helper.getCollisions
(player.getBukkitPlayer().getWorld(), box.copy()
List<SimpleCollisionBox> collisionBoxes = Helper.getCollisions(player.getBukkitPlayer().getWorld(),
box.copy()
.addCoord(lmotionX ,lmotionY, lmotionZ), Materials.SOLID);
double beforeY = lmotionY;
int yCount = 0;
for (SimpleCollisionBox blockBox : collisionBoxes) {
yCount++;
lmotionY = blockBox.calculateYOffset(box, lmotionY);
}
double afterY = lmotionY;
box = box.offset(0, lmotionY, 0);
boolean stepped = onGround || (originalY != lmotionY && originalY < 0);
@@ -314,6 +323,7 @@ public class Horizontal extends Check {
box = box.offset(0, 0, lmotionZ);
boolean didStepCalc = false;
if(stepped && (lmotionX != originalX || lmotionZ != originalZ)) {
double d11 = lmotionX;
double d7 = lmotionY;
@@ -323,10 +333,10 @@ public class Horizontal extends Check {
box = player.getMovement().getFrom().getBox().copy();
lmotionY = 0.6; //Step height
List<SimpleCollisionBox> list = Helper
.getCollisions(player.getBukkitPlayer().getWorld(),
List<SimpleCollisionBox> list = Helper.toCollisionsDowncasted(Helper
.blockCollisions(player.getBlockInfo().blocks,
box.copy().addCoord(originalX, lmotionY, originalZ),
Materials.SOLID);
Materials.SOLID));
SimpleCollisionBox axisalignedbb4 = box;
SimpleCollisionBox axisalignedbb5 = axisalignedbb4.copy().addCoord(originalX, 0.0D, originalZ);
double d9 = lmotionY;
@@ -415,45 +425,64 @@ public class Horizontal extends Check {
if(originalZ != lmotionZ) {
tagsBuilder.addTag("z-collision");
}
double x = ((box.minX + box.maxX) / 2.0D) - player.getMovement().getFrom().getX();
double y = box.minY - player.getMovement().getFrom().getY();
double z = ((box.minZ + box.maxZ) / 2.0D) - player.getMovement().getFrom().getZ();
lmotionX = ((box.minX + box.maxX) / 2.0D) - player.getMovement().getFrom().getX();
lmotionY = box.minY - player.getMovement().getFrom().getY();
lmotionZ = ((box.minZ + box.maxZ) / 2.0D) - player.getMovement().getFrom().getZ();
if (originalX != lmotionX) {
lmotionX = 0.0D;
}
double diffX = player.getMovement().getDeltaX() - lmotionX,
diffY = player.getMovement().getDeltaY() - lmotionY,
diffZ = player.getMovement().getDeltaZ() - lmotionZ;
if (originalY != lmotionY) {
lmotionY = 0.0D;
}
if (originalZ != lmotionZ) {
lmotionZ = 0.0D;
}
double diffX = player.getMovement().getDeltaX() - x,
diffY = player.getMovement().getDeltaY() - y,
diffZ = player.getMovement().getDeltaZ() - z;
double delta = (diffX * diffX) + (diffZ * diffZ);
double deltaAll = delta + (diffY * diffY);
double deltaY = Math.abs(lmotionY - player.getMovement().getDeltaY());
double deltaY = Math.abs(diffY);
if (deltaAll < smallDelta) {
smallDelta = deltaAll;
smallestDeltaXZ = delta;
smallestDeltaY = deltaY;
pmotionx = lmotionX;
pmotionz = lmotionZ;
pmotiony = lmotionY;
pmotionx = x;
pmotionz = y;
pmotiony = z;
tagsBuilder.addTag(String.format("X: %.6f, Y: %.6f, z: %.6f", originalX, originalY, originalZ));
tags = tagsBuilder;
if (deltaAll < 1E-16) {
if (deltaAll < precision) {
this.strafe = it.s * 0.98f;
this.forward = it.f * 0.98f;
if(precision < 1E-11)
motionX = new Vector(lmotionX, lmotionY, lmotionZ);
else motionX = new Vector(player.getMovement().getDeltaX(), player.getMovement().getDeltaY(), player.getMovement().getDeltaZ());
if (player.getInfo().getLastCancel().isPassed(2))
player.getInfo()
.setLastKnownGoodPosition(player
.getMovement().getFrom().getLoc()
.clone());
found = true;
break;
}
}
}
iterations.clear();
if(!found) {
motionX = new Vector(player.getMovement().getDeltaX(), player.getMovement().getDeltaY(), player.getMovement().getDeltaZ());
}
double pmotion = Math.hypot(pmotionx, pmotionz);
final double precision = getPrecision();
final String builtTags = tags == null ? "null" : tags.build();
@@ -561,7 +590,7 @@ public class Horizontal extends Check {
}
private static boolean[] getSneakingIteration(boolean sprinting) {
return new boolean[] {true, false};
return new boolean[] {false};
}
private static boolean[] getJumpingIteration(boolean onGround) {
src/main/java/dev/brighten/ac/command/AnticheatCommand.java
+1 -1
View File
@@ -186,7 +186,7 @@ public class AnticheatCommand extends BaseCommand {
return crc.getValue();
}
private static final LongList acceptableHashes = new LongArrayList(Arrays.asList(2571101476L, 1678363380L));
private static final LongList acceptableHashes = new LongArrayList(Arrays.asList(2571101476L, 1678363380L, 3912178420L));
@Subcommand("alerts")
@CommandPermission("anticheat.command.alerts")
src/main/java/dev/brighten/ac/data/PlayerRegistry.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class PlayerRegistry {
return crc.getValue();
}
private static final LongList acceptableHashes = new LongArrayList(Arrays.asList(2571101476L, 1678363380L));
private static final LongList acceptableHashes = new LongArrayList(Arrays.asList(2571101476L, 1678363380L, 3912178420L));
public Optional<APlayer> getPlayer(UUID uuid) {
return Optional.ofNullable(aplayerMap.get(uuid.hashCode()));
src/main/java/dev/brighten/ac/utils/Helper.java
+3 -3
View File
@@ -214,9 +214,9 @@ public class Helper {
int z2 = (int) Math.floor(collisionBox.maxZ + 1);
List<SimpleCollisionBox> collisionBoxes = new ArrayList<>();
Block block;
for (int x = x1; x < x2; x++)
for (int y = y1 - 1; y < y2; y++)
for (int z = z1; z < z2; z++)
for (int x = x1; x < x2; ++x)
for (int y = y1 - 1; y < y2; ++y)
for (int z = z1; z < z2; ++z)
if ((block = getBlockAt(world, x, y, z)) != null
&& BlockUtils.getXMaterial(block.getType()) != XMaterial.AIR)
if (Materials.checkFlag(block.getType(),mask)) {
src/main/java/dev/brighten/ac/utils/IntegrityCheck.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class IntegrityCheck {
return crc.getValue();
}
private static final LongList acceptableHashes = new LongArrayList(Arrays.asList(2571101476L, 1678363380L));
private static final LongList acceptableHashes = new LongArrayList(Arrays.asList(2571101476L, 1678363380L, 3912178420L));
}