diff --git a/src/main/java/com/moulberry/axiom/packet/SetBlockPacketListener.java b/src/main/java/com/moulberry/axiom/packet/SetBlockPacketListener.java index 453ca39..ca47bdf 100644 --- a/src/main/java/com/moulberry/axiom/packet/SetBlockPacketListener.java +++ b/src/main/java/com/moulberry/axiom/packet/SetBlockPacketListener.java @@ -4,7 +4,6 @@ import com.moulberry.axiom.AxiomPaper; import com.moulberry.axiom.integration.Integration; import com.moulberry.axiom.integration.coreprotect.CoreProtectIntegration; -import com.moulberry.axiom.integration.plotsquared.PlotSquaredIntegration; import io.netty.buffer.Unpooled; import net.kyori.adventure.text.Component; import net.minecraft.core.BlockPos; @@ -28,24 +27,22 @@ import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.lighting.LightEngine; import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import org.bukkit.Location; +import org.bukkit.World; import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R1.block.CapturedBlockState; import org.bukkit.craftbukkit.v1_20_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_20_R1.block.CraftBlockStates; +import org.bukkit.craftbukkit.v1_20_R1.block.CraftBlockState; import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_20_R1.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_20_R1.util.CraftMagicNumbers; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.block.Action; -import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.plugin.messaging.PluginMessageListener; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import xyz.jpenilla.reflectionremapper.ReflectionRemapper; import java.lang.reflect.InvocationTargetException; @@ -86,6 +83,12 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player pla } } + public static class AxiomPlacingCraftBlockState extends CraftBlockState { + public AxiomPlacingCraftBlockState(@Nullable World world, BlockPos blockPosition, BlockState blockData) { + super(world, blockPosition, blockData); + } + } + private void process(Player bukkitPlayer, byte[] message) { if (!this.plugin.canUseAxiom(bukkitPlayer, "axiom.build.place")) { return; @@ -139,8 +142,9 @@ private void process(Player bukkitPlayer, byte[] message) { // Call BlockMultiPlace / BlockPlace event List blockStates = new ArrayList<>(); + World world = player.serverLevel().getWorld(); for (Map.Entry entry : blocks.entrySet()) { - blockStates.add(CraftBlockStates.getBlockState(entry.getKey(), entry.getValue(), null)); + blockStates.add(new AxiomPlacingCraftBlockState(world, entry.getKey(), entry.getValue())); } Cancellable event = null;