Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-26 06:24:54 +02:00
Code Issues Projects Releases Wiki Activity

Don't hardcode breakBlock digging status

Browse Source
This commit is contained in:
themode 2021-03-09 21:54:10 +01:00
parent b155f3bca3
commit 68ef3e31af
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ public class PlayerDiggingListener {
if (instantBreak) {
// No need to check custom block
breakBlock(instance, player, blockPosition, blockStateId);
breakBlock(instance, player, blockPosition, blockStateId, status);
} else {
final CustomBlock customBlock = instance.getCustomBlock(blockPosition);
final int customBlockId = customBlock == null ? 0 : customBlock.getCustomBlockId();
@ -105,7 +105,7 @@ public class PlayerDiggingListener {
ClientPlayerDiggingPacket.Status.FINISHED_DIGGING, false);
} else {
// Vanilla block
breakBlock(instance, player, blockPosition, blockStateId);
breakBlock(instance, player, blockPosition, blockStateId, status);
}
} else if (status == ClientPlayerDiggingPacket.Status.DROP_ITEM_STACK) {
@ -163,7 +163,10 @@ public class PlayerDiggingListener {
}
}
private static void breakBlock(Instance instance, Player player, BlockPosition blockPosition, int blockStateId) {
private static void breakBlock(Instance instance,
Player player,
BlockPosition blockPosition, int blockStateId,
ClientPlayerDiggingPacket.Status status) {
// Finished digging, remove effect if any
player.resetTargetBlock();
@ -174,7 +177,7 @@ public class PlayerDiggingListener {
// Send acknowledge packet to allow or cancel the digging process
sendAcknowledgePacket(player, blockPosition, updatedBlockId,
ClientPlayerDiggingPacket.Status.FINISHED_DIGGING, result);
status, result);
if (!result) {
final boolean solid = Block.fromStateId((short) blockStateId).isSolid();