Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Criticals not working #4597

Merged
merged 2 commits into from
May 24, 2024
Merged

Fixed Criticals not working #4597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fedc293
Fixed Criticals not working
May 22, 2024
0f62aa3
revert more thoroughly
Wide-Cat May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/meteordevelopment/meteorclient/events/packets/PacketEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public static Receive get(Packet<?> packet, ClientConnection connection) {
public static class Send extends Cancellable {
private static final Send INSTANCE = new Send();

// overwriting this will overwrite the packet being sent
public Packet<?> packet;

public static Send get(Packet<?> packet) {
Expand Down
11 changes: 3 additions & 8 deletions src/main/java/meteordevelopment/meteorclient/mixin/ClientConnectionMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

package meteordevelopment.meteorclient.mixin;

import com.llamalad7.mixinextras.sugar.Local;
import com.llamalad7.mixinextras.sugar.ref.LocalRef;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPipeline;
import io.netty.handler.proxy.Socks4ProxyHandler;
Expand Down Expand Up @@ -69,12 +67,9 @@ private static void onConnect(InetSocketAddress address, boolean useEpoll, Clien
}

@Inject(at = @At("HEAD"), method = "send(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketCallbacks;)V", cancellable = true)
private void onSendPacketHead(CallbackInfo info, @Local LocalRef<Packet<?>> packet) {
PacketEvent.Send processedPacket = MeteorClient.EVENT_BUS.post(PacketEvent.Send.get(packet.get()));
if (processedPacket.isCancelled()) {
info.cancel();
} else {
packet.set(processedPacket.packet);
private void onSendPacketHead(Packet<?> packet, PacketCallbacks callbacks, CallbackInfo ci) {
if (MeteorClient.EVENT_BUS.post(PacketEvent.Send.get(packet)).isCancelled()) {
ci.cancel();
}
}

Expand Down
Loading