Skip to content

Commit

Permalink
improvements for packet modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@xGinko
xGinko committed Aug 7, 2024
1 parent 3b8d3ba commit 1b9986f
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 45 deletions.
2 changes: 1 addition & 1 deletion AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/InventoryLag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void disable() {

@Override
public void onPacketSend(PacketSendEvent event) {
if (event.isCancelled() || !measuredPacketTypes.contains(event.getPacketType())) return;
if (event.isCancelled() || !measuredPacketTypes.contains(event.getPacketType()) || event.getUser() == null) return;

PlayerData data = playerDataCache.get(event.getUser().getUUID(), PlayerData::new);

Expand Down
9 changes: 3 additions & 6 deletions AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/PurpurBeehiveCrash.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.google.common.io.ByteStreams;
import me.xginko.aef.utils.PlatformUtil;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.entity.Entity;
import org.bukkit.util.NumberConversions;

public class PurpurBeehiveCrash extends PacketModule {
Expand Down Expand Up @@ -45,16 +45,13 @@ public boolean shouldEnable() {

@Override
public void onPacketReceive(PacketReceiveEvent event) {
if (event.isCancelled()) return;
if (event.isCancelled() || event.getPlayer() == null) return;
if (event.getPacketType() != PacketType.Play.Client.PLUGIN_MESSAGE) return;

WrapperPlayClientPluginMessage packet = new WrapperPlayClientPluginMessage(event);
if (!packet.getChannelName().equalsIgnoreCase(beehive_c2s_channel)) return;

Player player = (Player) event.getPlayer();
if (player == null) return;

if (distanceSquared(ByteStreams.newDataInput(packet.getData()).readLong(), player.getLocation()) > maxDistanceSquared) {
if (distanceSquared(ByteStreams.newDataInput(packet.getData()).readLong(), ((Entity) event.getPlayer()).getLocation()) > maxDistanceSquared) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
}
Expand Down
5 changes: 2 additions & 3 deletions AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/TabCompleteCrash.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.github.retrooper.packetevents.event.PacketReceiveEvent;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientTabComplete;
import org.bukkit.entity.Player;
import org.bukkit.permissions.ServerOperator;

public class TabCompleteCrash extends PacketModule {

Expand Down Expand Up @@ -49,8 +49,7 @@ public void onPacketReceive(PacketReceiveEvent event) {
}
}

final Player player = (Player) event.getPlayer();
if (player != null && player.isOp()) return;
if (event.getPlayer() == null || ((ServerOperator) event.getPlayer()).isOp()) return;

for (String sequence : ABUSABLE_SEQUENCES) {
if (text.indexOf(sequence) != -1) {
Expand Down
18 changes: 10 additions & 8 deletions AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/packets/WindowClickCrash.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.github.retrooper.packetevents.event.PacketReceiveEvent;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClickWindow;
import org.bukkit.entity.Player;
import org.bukkit.entity.HumanEntity;

public class WindowClickCrash extends PacketModule {

Expand All @@ -29,22 +29,24 @@ public boolean shouldEnable() {
public void onPacketReceive(PacketReceiveEvent event) {
if (event.isCancelled()) return;
if (event.getPacketType() != PacketType.Play.Client.CLICK_WINDOW) return;
final WrapperPlayClientClickWindow packet = new WrapperPlayClientClickWindow(event);
WrapperPlayClientClickWindow packet = new WrapperPlayClientClickWindow(event);

final int button = packet.getButton();
int button = packet.getButton();

if (button < 0 || button > 10 && button != 40 && button != 99) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
return;
}

final int slot = packet.getSlot();
int slot = packet.getSlot();

final Player player = (Player) event.getPlayer();
if (player != null && slot >= player.getOpenInventory().countSlots()) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
if (event.getPlayer() != null) {
if (((HumanEntity) event.getPlayer()).getOpenInventory().countSlots() < slot) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
return;
}
}

if (slot != -999 && slot != -1) {
Expand Down
8 changes: 3 additions & 5 deletions AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/LecternCrash.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.github.retrooper.packetevents.event.PacketReceiveEvent;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClickWindow;
import org.bukkit.entity.Player;
import org.bukkit.entity.HumanEntity;
import org.bukkit.event.inventory.InventoryType;

public class LecternCrash extends PacketModule {
Expand All @@ -29,13 +29,11 @@ public boolean shouldEnable() {

@Override
public void onPacketReceive(PacketReceiveEvent event) {
if (event.isCancelled()) return;
if (event.isCancelled() || event.getPlayer() == null) return;
if (event.getPacketType() != PacketType.Play.Client.CLICK_WINDOW) return;
if (new WrapperPlayClientClickWindow(event).getWindowClickType() != WrapperPlayClientClickWindow.WindowClickType.QUICK_MOVE) return;
final Player player = (Player) event.getPlayer();
if (player == null) return;

if (player.getOpenInventory().getType() == LECTERN) {
if (((HumanEntity) event.getPlayer()).getOpenInventory().getType() == LECTERN) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
}
Expand Down
3 changes: 1 addition & 2 deletions ...nko/aef/modules/patches/MapCursorLag.java → ...nko/aef/modules/packets/MapCursorLag.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package me.xginko.aef.modules.patches;
package me.xginko.aef.modules.packets;

import com.github.retrooper.packetevents.PacketEvents;
import com.github.retrooper.packetevents.event.PacketListenerPriority;
import com.github.retrooper.packetevents.event.PacketSendEvent;
import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSpawnEntity;
import me.xginko.aef.modules.packets.PacketModule;
import me.xginko.aef.utils.EntityUtil;
import org.bukkit.entity.Entity;
import org.bukkit.entity.ItemFrame;
Expand Down
9 changes: 5 additions & 4 deletions AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/NoComExploit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientUpdateJigsawBlock;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientUpdateSign;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.entity.Entity;
import org.bukkit.util.NumberConversions;

public class NoComExploit extends PacketModule {
Expand Down Expand Up @@ -65,10 +65,11 @@ public void onPacketReceive(PacketReceiveEvent event) {
return; // PacketTypes like PlayerDigging are also used for dropping and swapping items. This prevents false positives.
}

final Player player = (Player) event.getPlayer();
if (player == null) return;
if (event.getPlayer() == null) {
return;
}

if (distanceSquared(blockPos, player.getLocation()) > maxDistanceSquared) {
if (distanceSquared(blockPos, ((Entity) event.getPlayer()).getLocation()) > maxDistanceSquared) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
}
Expand Down
8 changes: 3 additions & 5 deletions ...chyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/PurpurBeehiveCrash.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.google.common.io.ByteStreams;
import me.xginko.aef.utils.PlatformUtil;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.entity.Entity;
import org.bukkit.util.NumberConversions;

public class PurpurBeehiveCrash extends PacketModule {
Expand Down Expand Up @@ -48,14 +48,12 @@ public boolean shouldEnable() {
public void onPacketReceive(PacketReceiveEvent event) {
if (event.isCancelled()) return;
if (event.getPacketType() != PacketType.Play.Client.PLUGIN_MESSAGE) return;
if (event.getPlayer() == null) return;

WrapperPlayClientPluginMessage packet = new WrapperPlayClientPluginMessage(event);
if (!packet.getChannelName().equalsIgnoreCase(beehive_c2s_channel)) return;

Player player = (Player) event.getPlayer();
if (player == null) return;

if (distanceSquared(ByteStreams.newDataInput(packet.getData()).readLong(), player.getLocation()) > maxDistanceSquared) {
if (distanceSquared(ByteStreams.newDataInput(packet.getData()).readLong(), ((Entity) event.getPlayer()).getLocation()) > maxDistanceSquared) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
}
Expand Down
5 changes: 2 additions & 3 deletions AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/TabCompleteCrash.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.github.retrooper.packetevents.event.PacketReceiveEvent;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientTabComplete;
import org.bukkit.entity.Player;
import org.bukkit.permissions.ServerOperator;

public class TabCompleteCrash extends PacketModule {

Expand Down Expand Up @@ -49,8 +49,7 @@ public void onPacketReceive(PacketReceiveEvent event) {
}
}

final Player player = (Player) event.getPlayer();
if (player != null && player.isOp()) return;
if (event.getPlayer() == null || ((ServerOperator) event.getPlayer()).isOp()) return;

for (String sequence : ABUSABLE_SEQUENCES) {
if (text.indexOf(sequence) != -1) {
Expand Down
18 changes: 10 additions & 8 deletions AnarchyExploitFixesLegacy/src/main/java/me/xginko/aef/modules/packets/WindowClickCrash.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.github.retrooper.packetevents.event.PacketReceiveEvent;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientClickWindow;
import org.bukkit.entity.Player;
import org.bukkit.entity.HumanEntity;

public class WindowClickCrash extends PacketModule {

Expand All @@ -29,22 +29,24 @@ public boolean shouldEnable() {
public void onPacketReceive(PacketReceiveEvent event) {
if (event.isCancelled()) return;
if (event.getPacketType() != PacketType.Play.Client.CLICK_WINDOW) return;
final WrapperPlayClientClickWindow packet = new WrapperPlayClientClickWindow(event);
WrapperPlayClientClickWindow packet = new WrapperPlayClientClickWindow(event);

final int button = packet.getButton();
int button = packet.getButton();

if (button < 0 || button > 10 && button != 40 && button != 99) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
return;
}

final int slot = packet.getSlot();
int slot = packet.getSlot();

final Player player = (Player) event.getPlayer();
if (player != null && slot >= player.getOpenInventory().countSlots()) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
if (event.getPlayer() != null) {
if (((HumanEntity) event.getPlayer()).getOpenInventory().countSlots() < slot) {
event.setCancelled(true);
onCancel(log, kick, event.getUser());
return;
}
}

if (slot != -999 && slot != -1) {
Expand Down

0 comments on commit 1b9986f

Please sign in to comment.