fix: dupe when interaction is allowed but block editing is not

FTBTeam/FTB-Mods-Issues#1752

Author: desht

common/src/main/java/dev/ftb/mods/ftbchunks/FTBChunks.java

@@ -44,6 +44,7 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BaseSpawner;
 import net.minecraft.world.level.Explosion;
@@ -280,9 +281,17 @@ public EventResult blockLeftClick(Player player, InteractionHand hand, BlockPos
 	public EventResult blockRightClick(Player player, InteractionHand hand, BlockPos pos, Direction face) {
 		// calling architectury stub method
 		//noinspection ConstantConditions
-		if (player instanceof ServerPlayer sp && ClaimedChunkManagerImpl.getInstance().shouldPreventInteraction(player, hand, pos, FTBChunksExpected.getBlockInteractProtection(), null)) {
-			FTBCUtils.forceHeldItemSync(sp, hand);
-			return EventResult.interruptFalse();
+		if (player instanceof ServerPlayer sp) {
+			boolean blockItem = sp.getItemInHand(hand).getItem() instanceof BlockItem;
+			ClaimedChunkManagerImpl mgr = ClaimedChunkManagerImpl.getInstance();
+			// not ideal since it also prevents right-clicking *any* blocks if holding a block item when block placement is prevented
+			//   but necessary - https://github.com/FTBTeam/FTB-Mods-Issues/issues/1752
+			if (mgr.shouldPreventInteraction(player, hand, pos, FTBChunksExpected.getBlockInteractProtection(), null)
+					|| blockItem && mgr.shouldPreventInteraction(player, hand, pos, FTBChunksExpected.getBlockPlaceProtection(), null))
+			{
+				FTBCUtils.forceHeldItemSync(sp, hand);
+				return EventResult.interruptFalse();
+			}
 		}
 
 		return EventResult.pass();
@@ -418,7 +427,7 @@ private void playerChangedDimension(ServerPlayer serverPlayer, ResourceKey<Level
 	}
 
 	@SuppressWarnings("UnreachableCode")
-    private void teamConfig(TeamCollectPropertiesEvent event) {
+	private void teamConfig(TeamCollectPropertiesEvent event) {
 		event.add(FTBChunksProperties.ALLOW_EXPLOSIONS);
 		event.add(FTBChunksProperties.ALLOW_MOB_GRIEFING);
 		event.add(FTBChunksProperties.ALLOW_ALL_FAKE_PLAYERS);
@@ -478,7 +487,7 @@ private void playerLeftParty(PlayerLeftPartyTeamEvent event) {
 	}
 
 	@SuppressWarnings("UnreachableCode")
-    private void transferClaims(ChunkTeamDataImpl transferFrom, ChunkTeamDataImpl transferTo, Collection<ClaimedChunkImpl> chunksToTransfer) {
+	private void transferClaims(ChunkTeamDataImpl transferFrom, ChunkTeamDataImpl transferTo, Collection<ClaimedChunkImpl> chunksToTransfer) {
 		CommandSourceStack sourceStack = ClaimedChunkManagerImpl.getInstance().getMinecraftServer().createCommandSourceStack();
 
 		String fromName = transferFrom.getTeam().getShortName();