Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-06 08:27:43 +01:00
Code Issues Projects Releases Wiki Activity

Check for adventure mode when finishing to break a block (#948) (#949)

Browse Source
This commit is contained in:
Weiiswurst 2022-04-19 16:52:56 +02:00 committed by GitHub
parent f0fa81b712
commit 21e6ed4918
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
View File

@ -57,16 +57,12 @@ public final class PlayerDiggingListener {
final Block block = instance.getBlock(blockPosition); final Block block = instance.getBlock(blockPosition);
final GameMode gameMode = player.getGameMode(); final GameMode gameMode = player.getGameMode();
if (gameMode == GameMode.SPECTATOR) { // Prevent spectators and check players in adventure mode
// Spectators can't break blocks if (shouldPreventBreaking(player, block)) {
return new DiggingResult(block, false); return new DiggingResult(block, false);
} else if (gameMode == GameMode.ADVENTURE) { }
// Check if the item can break the block with the current item
final ItemStack itemInMainHand = player.getItemInMainHand(); if (gameMode == GameMode.CREATIVE) {
if (!itemInMainHand.meta().getCanDestroy().contains(block)) {
return new DiggingResult(block, false);
}
} else if (gameMode == GameMode.CREATIVE) {
return breakBlock(instance, player, blockPosition, block); return breakBlock(instance, player, blockPosition, block);
} }
@ -89,10 +85,28 @@ public final class PlayerDiggingListener {
private static DiggingResult finishDigging(Player player, Instance instance, Point blockPosition) { private static DiggingResult finishDigging(Player player, Instance instance, Point blockPosition) {
final Block block = instance.getBlock(blockPosition); final Block block = instance.getBlock(blockPosition);
// TODO sanity check
if (shouldPreventBreaking(player, block)) {
return new DiggingResult(block, false);
}
return breakBlock(instance, player, blockPosition, block); return breakBlock(instance, player, blockPosition, block);
} }
private static boolean shouldPreventBreaking(@NotNull Player player, Block block) {
if (player.getGameMode() == GameMode.SPECTATOR) {
// Spectators can't break blocks
return true;
} else if (player.getGameMode() == GameMode.ADVENTURE) {
// Check if the item can break the block with the current item
final ItemStack itemInMainHand = player.getItemInMainHand();
if (!itemInMainHand.meta().getCanDestroy().contains(block)) {
return true;
}
}
return false;
}
private static void dropStack(Player player) { private static void dropStack(Player player) {
final ItemStack droppedItemStack = player.getInventory().getItemInMainHand(); final ItemStack droppedItemStack = player.getInventory().getItemInMainHand();
dropItem(player, droppedItemStack, ItemStack.AIR); dropItem(player, droppedItemStack, ItemStack.AIR);