Skip to content

Commit

Permalink
Update ExplosionHandler to account for 1.21.2 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@SamB440
SamB440 committed Dec 6, 2024
1 parent d598ae0 commit 2ac8a86
Showing 1 changed file with 49 additions and 36 deletions.
85 changes: 49 additions & 36 deletions src/main/java/ac/grim/grimac/checks/impl/velocity/ExplosionHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
import ac.grim.grimac.utils.anticheat.update.PredictionComplete;
import ac.grim.grimac.utils.data.VectorData;
import ac.grim.grimac.utils.data.VelocityData;
import com.github.retrooper.packetevents.PacketEvents;
import com.github.retrooper.packetevents.event.PacketSendEvent;
import com.github.retrooper.packetevents.manager.server.ServerVersion;
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
import com.github.retrooper.packetevents.protocol.world.states.defaulttags.BlockTags;
import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
import com.github.retrooper.packetevents.protocol.world.states.type.StateValue;
import com.github.retrooper.packetevents.util.Vector3d;
import com.github.retrooper.packetevents.util.Vector3f;
import com.github.retrooper.packetevents.util.Vector3i;
import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerExplosion;
Expand Down Expand Up @@ -47,42 +50,13 @@ public void onPacketSend(final PacketSendEvent event) {
if (event.getPacketType() == PacketType.Play.Server.EXPLOSION) {
WrapperPlayServerExplosion explosion = new WrapperPlayServerExplosion(event);

Vector3f velocity = explosion.getPlayerMotion();

final @Nullable WrapperPlayServerExplosion.BlockInteraction blockInteraction = explosion.getBlockInteraction();
final boolean shouldDestroy = blockInteraction != WrapperPlayServerExplosion.BlockInteraction.KEEP_BLOCKS;
if (!explosion.getRecords().isEmpty() && shouldDestroy) {
player.sendTransaction();

player.latencyUtils.addRealTimeTask(player.lastTransactionSent.get(), () -> {
for (Vector3i record : explosion.getRecords()) {
// Null OR not flip redstone blocks, then set to air
if (blockInteraction != WrapperPlayServerExplosion.BlockInteraction.TRIGGER_BLOCKS) {
player.compensatedWorld.updateBlock(record.x, record.y, record.z, 0);
} else {
// We need to flip redstone blocks, or do special things with other blocks
final WrappedBlockState state = player.compensatedWorld.getWrappedBlockStateAt(record);
final StateType type = state.getType();
if (BlockTags.CANDLES.contains(type) || BlockTags.CANDLE_CAKES.contains(type)) {
state.setLit(false);
continue;
} else if (type == StateTypes.BELL) {
// Does this affect anything? I don't know, I don't see anything that relies on whether a bell is ringing.
continue;
}

// Otherwise try and flip/open it.
final Object poweredValue = state.getInternalData().get(StateValue.POWERED);
final boolean canFlip = (poweredValue != null && !(Boolean) poweredValue) || type == StateTypes.LEVER;
if (canFlip) {
player.compensatedWorld.tickOpenable(record.x, record.y, record.z);
}
}
}
});
// Since 1.21.2, the server will instead send these changes via block change packets
if (PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_21_2)) {
this.handleBlockExplosions(explosion);
}

if (velocity.x != 0 || velocity.y != 0 || velocity.z != 0) {
Vector3d velocity = explosion.getKnockback();
if (velocity != null && (velocity.x != 0 || velocity.y != 0 || velocity.z != 0)) {
// No need to spam transactions
if (explosion.getRecords().isEmpty()) player.sendTransaction();
addPlayerExplosion(player.lastTransactionSent.get(), velocity);
Expand All @@ -91,15 +65,54 @@ public void onPacketSend(final PacketSendEvent event) {
}
}

private void handleBlockExplosions(WrapperPlayServerExplosion explosion) {
final @Nullable WrapperPlayServerExplosion.BlockInteraction blockInteraction = explosion.getBlockInteraction();
final boolean shouldDestroy = blockInteraction != WrapperPlayServerExplosion.BlockInteraction.KEEP_BLOCKS;
if (explosion.getRecords().isEmpty() || !shouldDestroy) {
return;
}

player.sendTransaction();

player.latencyUtils.addRealTimeTask(player.lastTransactionSent.get(), () -> {
for (Vector3i record : explosion.getRecords()) {
// Null OR not flip redstone blocks, then set to air
if (blockInteraction != WrapperPlayServerExplosion.BlockInteraction.TRIGGER_BLOCKS) {
player.compensatedWorld.updateBlock(record.x, record.y, record.z, 0);
} else {
// We need to flip redstone blocks, or do special things with other blocks
final WrappedBlockState state = player.compensatedWorld.getWrappedBlockStateAt(record);
final StateType type = state.getType();
if (BlockTags.CANDLES.contains(type) || BlockTags.CANDLE_CAKES.contains(type)) {
state.setLit(false);
continue;
} else if (type == StateTypes.BELL) {
// Does this affect anything? I don't know, I don't see anything that relies on whether a bell is ringing.
continue;
}

// Otherwise try and flip/open it.
final Object poweredValue = state.getInternalData().get(StateValue.POWERED);
final boolean canFlip = (poweredValue != null && !(Boolean) poweredValue) || type == StateTypes.LEVER;
if (canFlip) {
player.compensatedWorld.tickOpenable(record.x, record.y, record.z);
}
}
}
});
}

public VelocityData getFutureExplosion() {
// Chronologically in the future
if (firstBreadMap.size() > 0) {
if (!firstBreadMap.isEmpty()) {
return firstBreadMap.peek();
}

// Less in the future
if (lastExplosionsKnownTaken != null) {
return lastExplosionsKnownTaken;
}

// Uncertain, might be in the future
if (player.firstBreadExplosion != null && player.likelyExplosions == null) {
return player.firstBreadExplosion;
Expand All @@ -120,7 +133,7 @@ public boolean wouldFlag() {
return (player.likelyExplosions != null && player.likelyExplosions.offset > offsetToFlag) || (player.firstBreadExplosion != null && player.firstBreadExplosion.offset > offsetToFlag);
}

public void addPlayerExplosion(int breadOne, Vector3f explosion) {
public void addPlayerExplosion(int breadOne, Vector3d explosion) {
firstBreadMap.add(new VelocityData(-1, breadOne, player.getSetbackTeleportUtil().isSendingSetback, new Vector(explosion.getX(), explosion.getY(), explosion.getZ())));
}

Expand Down

0 comments on commit 2ac8a86

Please sign in to comment.