Merge branch 'mc/1.21.6' into mc/1.21.7

Author: qixils

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 A list of all changes made to the software in reverse chronological order.
 
+## 4.5.3
+
+- Gravel, Ore Vein, and Dig Hole effects no longer replace tile entities
+
 ## 4.5.2
 
 - Paper: Added support for 26.1.1 and its new _Age Nearby Mobs_ effects

gradle.properties

@@ -1,5 +1,5 @@
 group = dev.qixils.crowdcontrol.plugin
-version = 4.5.2
+version = 4.5.3
 
 # increase available memory
 org.gradle.jvmargs=-Xmx2G

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

@@ -39,9 +39,12 @@ public void execute(@NotNull Supplier<@NotNull List<@NotNull ServerPlayer>> play
 				for (double x = -DIG_RADIUS; x <= DIG_RADIUS; ++x) {
 					for (int y = depth; y <= 0; ++y) {
 						for (double z = -DIG_RADIUS; z <= DIG_RADIUS; ++z) {
-							Location block = playerLocation.add(x, y, z);
-							if (!block.block().isAir())
-								locations.add(block);
+							Location loc = playerLocation.add(x, y, z);
+							var block = loc.block();
+							if (block.isAir()) continue;
+							if (block.hasBlockEntity()) continue;
+
+							locations.add(loc);
 						}
 					}
 				}

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

@@ -11,7 +11,6 @@
 import live.crowdcontrol.cc4j.websocket.payload.PublicEffectPayload;
 import lombok.Getter;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Blocks;
 import org.jetbrains.annotations.NotNull;
 
@@ -35,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().liquid())
+					.locationValidator(loc -> !loc.block().isAir() && !loc.block().is(Blocks.GRAVEL) && !loc.block().liquid() && !loc.block().hasBlockEntity())
 					.shuffleLocations(false)
 					.maxRadius(7)
 					.build().getAll());

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

@@ -53,9 +53,12 @@ private void addOreVein(List<Location> deepslateBlocks, List<Location> stoneBloc
 				for (int z = 0; z <= 2; ++z) {
 					Location loc = base.add(x, y, z);
 					BlockState block = loc.block();
+					if (block.isAir()) continue;
+					if (loc.block().hasBlockEntity()) continue;
+
 					if (block.is(ORE_BEARING_GROUND_DEEPSLATE)) {
 						deepslateBlocks.add(loc);
-					} else if (!block.isAir()) {
+					} else {
 						stoneBlocks.add(loc);
 					}
 				}
@@ -80,7 +83,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())
+					.locationValidator(loc -> !loc.block().isAir() && !loc.block().hasBlockEntity())
 					.build();
 
 				Registry<Block> registry = player.level().registryAccess().lookupOrThrow(Registries.BLOCK);

paper/src/main/java/dev/qixils/crowdcontrol/plugin/paper/commands/DigCommand.java

@@ -10,6 +10,7 @@
 import lombok.Getter;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.block.TileState;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -37,11 +38,12 @@ protected boolean executeRegionallySync(@NotNull Player player, @NotNull PublicE
 		for (double x = -DIG_RADIUS; x <= DIG_RADIUS; ++x) {
 			for (int y = depth; y <= 0; ++y) {
 				for (double z = -DIG_RADIUS; z <= DIG_RADIUS; ++z) {
-					Location block = playerLocation.clone().add(x, y, z);
-					if (!block.getBlock().isEmpty()) {
-						block.getBlock().setType(Material.AIR);
-						success = true;
-					}
+					Location loc = playerLocation.clone().add(x, y, z);
+					if (loc.getBlock().isEmpty()) continue;
+					if (loc.getBlock().getState() instanceof TileState) continue;
+
+					loc.getBlock().setType(Material.AIR);
+					success = true;
 				}
 			}
 		}

paper/src/main/java/dev/qixils/crowdcontrol/plugin/paper/commands/GravelCommand.java

@@ -11,6 +11,7 @@
 import lombok.Getter;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.block.TileState;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
@@ -33,7 +34,7 @@ public GravelCommand(PaperCrowdControlPlugin plugin) {
 	protected boolean executeRegionallySync(@NotNull Player player, @NotNull PublicEffectPayload request, @NotNull CCPlayer ccPlayer) {
 		List<Location> locations = BlockUtil.BlockFinder.builder()
 			.origin(player.getLocation())
-			.locationValidator(loc -> !loc.getBlock().isEmpty() && loc.getBlock().getType() != Material.GRAVEL && !loc.getBlock().isLiquid())
+			.locationValidator(loc -> !loc.getBlock().isEmpty() && loc.getBlock().getType() != Material.GRAVEL && !loc.getBlock().isLiquid() && !(loc.getBlock().getState() instanceof TileState))
 			.shuffleLocations(false)
 			.maxRadius(7)
 			.build().getAll();

paper/src/main/java/dev/qixils/crowdcontrol/plugin/paper/commands/VeinCommand.java

@@ -14,6 +14,7 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.TileState;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -43,9 +44,12 @@ private static void addOreVein(List<Location> deepslateBlocks, List<Location> st
 					Location loc = base.clone().add(x, y, z);
 					Block block = loc.getBlock();
 					Material matType = block.getType();
+					if (block.isEmpty()) continue;
+					if (block.getState() instanceof TileState) continue;
+
 					if (matType == Material.DEEPSLATE) {
 						deepslateBlocks.add(loc);
-					} else if (!block.isEmpty()) {
+					} else {
 						stoneBlocks.add(loc);
 					}
 				}
@@ -72,7 +76,7 @@ protected boolean executeRegionallySync(@NotNull Player player, @NotNull PublicE
 		BlockFinder finder = BlockFinder.builder()
 			.origin(player.getLocation())
 			.maxRadius(VEIN_RADIUS)
-			.locationValidator(loc -> !loc.getBlock().isEmpty())
+			.locationValidator(loc -> !loc.getBlock().isEmpty() && !(loc.getBlock().getState() instanceof TileState))
 			.build();
 
 		boolean success = false;