Skip to content

Commit 71d93c9

Browse files
committed
Minor build fixes after rebase on upstream
1 parent 43f4c7f commit 71d93c9

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

common/src/main/java/ac/grim/grimac/checks/impl/inventory/InventoryE.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ && flagAndAlert()) {
2929
if (shouldModifyPackets()) {
3030
event.setCancelled(true);
3131
player.onPacketCancel();
32-
player.getInventory().needResend = true;
32+
player.inventory.needResend = true;
3333
}
3434
if (!isNoSetbackPermission()) {
3535
closeInventory();

common/src/main/java/ac/grim/grimac/checks/type/InventoryCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void onPacketReceive(final PacketReceiveEvent event) {
2727
if (closeTransaction != NONE && shouldModifyPackets()) {
2828
event.setCancelled(true);
2929
player.onPacketCancel();
30-
player.getInventory().needResend = true;
30+
player.inventory.needResend = true;
3131
}
3232
} else if (event.getPacketType() == PacketType.Play.Client.CLOSE_WINDOW) {
3333
// Players with high ping can close inventory faster than send transaction back
@@ -42,7 +42,7 @@ public void closeInventory() {
4242
return;
4343
}
4444

45-
int windowId = player.getInventory().openWindowID;
45+
int windowId = player.inventory.openWindowID;
4646

4747
player.user.writePacket(new WrapperPlayServerCloseWindow(windowId));
4848

common/src/main/java/ac/grim/grimac/command/commands/GrimDebug.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private void handleConsoleDebug(@NotNull CommandContext<Sender> context) {
9696
sender.sendMessage(message);
9797
}
9898

99-
private void handleHitboxDebug(@NonNull CommandContext<Sender> context) {
99+
private void handleHitboxDebug(@NotNull CommandContext<Sender> context) {
100100
Sender sender = context.sender();
101101
PlayerSelector playerSelector = context.getOrDefault("target", null);
102102

common/src/main/java/ac/grim/grimac/manager/CheckManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import ac.grim.grimac.checks.impl.exploit.ExploitB;
2020
import ac.grim.grimac.checks.impl.groundspoof.NoFall;
2121
import ac.grim.grimac.checks.impl.inventory.*;
22-
import ac.grim.grimac.checks.impl.inventory.InventoryD;
2322
import ac.grim.grimac.checks.impl.misc.ClientBrand;
2423
import ac.grim.grimac.checks.impl.misc.GhostBlockMitigation;
2524
import ac.grim.grimac.checks.impl.misc.Post;

common/src/main/java/ac/grim/grimac/player/GrimPlayer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -670,20 +670,20 @@ public double[] getPossibleEyeHeights() { // We don't return sleeping eye height
670670
// 1.21.2+ added end tick input packet, fixing skipped tick issues
671671
public Vector3dm[] getPossibleLookVectors(boolean isPrediction) {
672672
// https://bugs.mojang.com/browse/MC-67665
673-
List<Vector3dm> possibleLookDirs = new ArrayList<>(Collections.singletonList(ReachUtils.getLook(this, this.xRot, this.yRot)));
673+
List<Vector3dm> possibleLookDirs = new ArrayList<>(Collections.singletonList(ReachUtils.getLook(this, this.yaw, this.pitch)));
674674

675675
// If we are a tick behind, we don't know their next look so don't bother doing this
676676
if (!isPrediction) {
677-
possibleLookDirs.add(ReachUtils.getLook(this, this.lastXRot, this.yRot));
677+
possibleLookDirs.add(ReachUtils.getLook(this, this.lastYaw, this.pitch));
678678

679679
// 1.9+ players could be a tick behind because we don't get skipped ticks
680680
if (this.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_9)) {
681-
possibleLookDirs.add(ReachUtils.getLook(this, this.lastXRot, this.lastYRot));
681+
possibleLookDirs.add(ReachUtils.getLook(this, this.lastYaw, this.lastPitch));
682682
}
683683

684684
// 1.7 players do not have any of these issues! They are always on the latest look vector
685685
if (this.getClientVersion().isOlderThan(ClientVersion.V_1_8)) {
686-
possibleLookDirs = Collections.singletonList(ReachUtils.getLook(this, this.xRot, this.yRot));
686+
possibleLookDirs = Collections.singletonList(ReachUtils.getLook(this, this.yaw, this.pitch));
687687
}
688688
}
689689

common/src/main/java/ac/grim/grimac/utils/latency/LatencyUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import ac.grim.grimac.utils.anticheat.LogUtil;
66
import ac.grim.grimac.utils.anticheat.MessageUtil;
77
import ac.grim.grimac.utils.common.arguments.CommonGrimArguments;
8-
import ac.grim.grimac.utils.data.Pair;
9-
import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
108

119
import java.util.*;
1210

0 commit comments

Comments
 (0)