Made the temporary fix for the protocol v7 AxiomPaper.

Author: Timongcraft

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.moulberry.axiom"
-version = "1.5.0"
+version = "1.5.1"
 description = "Serverside component for Axiom on Paper"
 
 java {

src/main/java/com/moulberry/axiom/packet/SetBlockPacketListener.java

@@ -12,7 +12,6 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 import net.minecraft.world.entity.ai.village.poi.PoiTypes;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -26,8 +25,10 @@
 import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.v1_20_R2.block.CraftBlock;
 import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R2.event.CraftEventFactory;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 import org.jetbrains.annotations.NotNull;
@@ -38,7 +39,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.logging.Level;
 
 public class SetBlockPacketListener implements PluginMessageListener {
 
@@ -62,9 +62,8 @@ public SetBlockPacketListener(AxiomPaper plugin) {
 
     @Override
     public void onPluginMessageReceived(@NotNull String channel, @NotNull Player bukkitPlayer, @NotNull byte[] message) {
-        if (!bukkitPlayer.hasPermission("axiom.*")) {
+        if (!bukkitPlayer.hasPermission("axiom.*"))
             return;
-        }
 
         // Check if player is allowed to modify this world
         AxiomModifyWorldEvent modifyWorldEvent = new AxiomModifyWorldEvent(bukkitPlayer, bukkitPlayer.getWorld());
@@ -82,7 +81,9 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player buk
         InteractionHand hand = friendlyByteBuf.readEnum(InteractionHand.class);
         int sequenceId = friendlyByteBuf.readVarInt();
 
-        ServerPlayer player = ((CraftPlayer)bukkitPlayer).getHandle();
+        ServerPlayer player = ((CraftPlayer) bukkitPlayer).getHandle();
+
+        Action interactAction = breaking ? Action.LEFT_CLICK_BLOCK : Action.RIGHT_CLICK_BLOCK;
 
         org.bukkit.inventory.ItemStack heldItem;
         if (hand == InteractionHand.MAIN_HAND) {
@@ -92,21 +93,33 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player buk
         }
 
         org.bukkit.block.Block blockClicked = bukkitPlayer.getWorld().getBlockAt(blockHit.getBlockPos().getX(),
-            blockHit.getBlockPos().getY(), blockHit.getBlockPos().getZ());
+                blockHit.getBlockPos().getY(), blockHit.getBlockPos().getZ());
 
         BlockFace blockFace = CraftBlock.notchToBlockFace(blockHit.getDirection());
 
         // Call interact event
-        PlayerInteractEvent playerInteractEvent = new PlayerInteractEvent(bukkitPlayer,
-            breaking ? Action.LEFT_CLICK_BLOCK : Action.RIGHT_CLICK_BLOCK, heldItem, blockClicked, blockFace);
-        if (!playerInteractEvent.callEvent()) {
-            if (sequenceId >= 0) {
-                player.connection.ackBlockChangesUpTo(sequenceId);
+        if (new PlayerInteractEvent(bukkitPlayer, interactAction, heldItem, blockClicked, blockFace).callEvent()) {
+            updateBlocks(player, updateNeighbors, blocks);
+
+            org.bukkit.block.Block bukkitBlock = bukkitPlayer.getWorld().getBlockAt(blockClicked.getX(), blockClicked.getY(), blockClicked.getZ());
+
+            boolean cancelled;
+            if (interactAction.isLeftClick()) {
+                cancelled = !new BlockBreakEvent(bukkitBlock, bukkitPlayer).callEvent();
+            } else {
+                cancelled = CraftEventFactory.callBlockPlaceEvent(player.serverLevel(), player, player.getUsedItemHand(), bukkitBlock.getState(), blockClicked.getX(), blockClicked.getY(), blockClicked.getZ()).isCancelled();
             }
-            return;
+
+            if (cancelled)
+                updateBlocks(player, updateNeighbors, blocks);
+        }
+
+        if (sequenceId >= 0) {
+            player.connection.ackBlockChangesUpTo(sequenceId);
         }
+    }
 
-        // Update blocks
+    private void updateBlocks(ServerPlayer player, boolean updateNeighbors, Map<BlockPos, BlockState> blocks) {
         if (updateNeighbors) {
             for (Map.Entry<BlockPos, BlockState> entry : blocks.entrySet()) {
                 player.level().setBlock(entry.getKey(), entry.getValue(), 3);
@@ -143,7 +156,8 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player buk
                         case OCEAN_FLOOR -> oceanFloor = heightmap.getValue();
                         case MOTION_BLOCKING -> motionBlocking = heightmap.getValue();
                         case MOTION_BLOCKING_NO_LEAVES -> motionBlockingNoLeaves = heightmap.getValue();
-                        default -> {}
+                        default -> {
+                        }
                     }
                 }
 
@@ -160,7 +174,7 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player buk
 
                         if (blockEntity == null) {
                             // There isn't a block entity here, create it!
-                            blockEntity = ((EntityBlock)block).newBlockEntity(blockPos, blockState);
+                            blockEntity = ((EntityBlock) block).newBlockEntity(blockPos, blockState);
                             if (blockEntity != null) {
                                 chunk.addAndRegisterBlockEntity(blockEntity);
                             }
@@ -178,7 +192,7 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player buk
                             // Block entity type isn't correct, we need to recreate it
                             chunk.removeBlockEntity(blockPos);
 
-                            blockEntity = ((EntityBlock)block).newBlockEntity(blockPos, blockState);
+                            blockEntity = ((EntityBlock) block).newBlockEntity(blockPos, blockState);
                             if (blockEntity != null) {
                                 chunk.addAndRegisterBlockEntity(blockEntity);
                             }
@@ -201,7 +215,7 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player buk
                     Optional<Holder<PoiType>> oldPoi = PoiTypes.forState(old);
                     if (!Objects.equals(oldPoi, newPoi)) {
                         if (oldPoi.isPresent()) level.getPoiManager().remove(blockPos);
-                        if (newPoi.isPresent()) level.getPoiManager().add(blockPos, newPoi.get());
+                        newPoi.ifPresent(poiTypeHolder -> level.getPoiManager().add(blockPos, newPoi.get()));
                     }
                 }
 
@@ -211,10 +225,6 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player buk
                 }
             }
         }
-
-        if (sequenceId >= 0) {
-            player.connection.ackBlockChangesUpTo(sequenceId);
-        }
     }
 
 }