fix: merge conflicts

Author: qixils

mojmap/src/main/java/dev/qixils/crowdcontrol/plugin/fabric/commands/DigCommand.java

@@ -42,7 +42,7 @@ public void execute(@NotNull Supplier<@NotNull List<@NotNull ServerPlayer>> play
 							Location loc = playerLocation.add(x, y, z);
 							var block = loc.block();
 							if (block.isAir()) continue;
-							if (block.hasBlockEntity()) continue;
+							if (block.getBlock().isEntityBlock()) continue;
 
 							locations.add(loc);
 						}

mojmap/src/main/java/dev/qixils/crowdcontrol/plugin/fabric/commands/GravelCommand.java

@@ -34,7 +34,7 @@ public void execute(@NotNull Supplier<@NotNull List<@NotNull ServerPlayer>> play
 			for (ServerPlayer player : playerSupplier.get())
 				locations.addAll(BlockFinder.builder()
 					.origin(player)
-					.locationValidator(loc -> !loc.block().isAir() && !loc.block().is(Blocks.GRAVEL) && !loc.block().getMaterial().isLiquid() && !loc.block().hasBlockEntity())
+					.locationValidator(loc -> !loc.block().isAir() && !loc.block().is(Blocks.GRAVEL) && !loc.block().getMaterial().isLiquid() && !loc.block().getBlock().isEntityBlock())
 					.shuffleLocations(false)
 					.maxRadius(7)
 					.build().getAll());

mojmap/src/main/java/dev/qixils/crowdcontrol/plugin/fabric/commands/VeinCommand.java

@@ -44,7 +44,7 @@ private void addOreVein(List<Location> stoneBlocks, Location base) {
 					Location loc = base.add(x, y, z);
 					BlockState block = loc.block();
 					if (block.isAir()) continue;
-					if (loc.block().hasBlockEntity()) continue;
+					if (loc.block().getBlock().isEntityBlock()) continue;
 
 					stoneBlocks.add(loc);
 				}
@@ -69,7 +69,7 @@ public void execute(@NotNull Supplier<@NotNull List<@NotNull ServerPlayer>> play
 				BlockFinder finder = BlockFinder.builder()
 					.origin(new Location(player))
 					.maxRadius(VEIN_RADIUS)
-					.locationValidator(loc -> !loc.block().isAir() && !loc.block().hasBlockEntity())
+					.locationValidator(loc -> !loc.block().isAir() && !loc.block().getBlock().isEntityBlock())
 					.build();
 
 				List<Ore> ores = new ArrayList<>();