Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-30 15:37:32 +02:00
Code Issues Projects Releases Wiki Activity

Fix compile

Browse Source
This commit is contained in:
TheMode 2021-06-17 15:57:10 +02:00
parent 6e0598c16a
commit 26b9ebc3f5
2 changed files with 4 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/instance/InstanceContainer.java
View File

@ -248,8 +248,6 @@ public class InstanceContainer extends Instance {
@Override
public boolean breakBlock(@NotNull Player player, @NotNull BlockPosition blockPosition) {
player.resetTargetBlock();
final Chunk chunk = getChunkAt(blockPosition);
Check.notNull(chunk, "You cannot break blocks in a null chunk!");

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

@ -13,20 +13,11 @@ import net.minestom.server.item.ItemStack;
import net.minestom.server.item.StackingRule;
import net.minestom.server.network.packet.client.play.ClientPlayerDiggingPacket;
import net.minestom.server.network.packet.server.play.AcknowledgePlayerDiggingPacket;
import net.minestom.server.network.packet.server.play.EntityEffectPacket;
import net.minestom.server.network.packet.server.play.RemoveEntityEffectPacket;
import net.minestom.server.potion.Potion;
import net.minestom.server.potion.PotionEffect;
import net.minestom.server.utils.BlockPosition;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
public class PlayerDiggingListener {
private static final List<Player> playersEffect = new CopyOnWriteArrayList<>();
public static void playerDiggingListener(ClientPlayerDiggingPacket packet, Player player) {
final ClientPlayerDiggingPacket.Status status = packet.status;
final BlockPosition blockPosition = packet.blockPosition;
@ -66,36 +57,21 @@ public class PlayerDiggingListener {
PlayerStartDiggingEvent playerStartDiggingEvent = new PlayerStartDiggingEvent(player, block, blockPosition);
EventDispatcher.call(playerStartDiggingEvent);
if (playerStartDiggingEvent.isCancelled()) {
addEffect(player);
// Unsuccessful digging
sendAcknowledgePacket(player, blockPosition, block,
ClientPlayerDiggingPacket.Status.STARTED_DIGGING, false);
} else if (false) {
// TODO: Handle Custom Block here
}
sendAcknowledgePacket(player, blockPosition, block,
ClientPlayerDiggingPacket.Status.STARTED_DIGGING, !playerStartDiggingEvent.isCancelled());
}
} else if (status == ClientPlayerDiggingPacket.Status.CANCELLED_DIGGING) {
final Block block = instance.getBlock(blockPosition);
// Remove custom block target
player.resetTargetBlock();
sendAcknowledgePacket(player, blockPosition, block,
ClientPlayerDiggingPacket.Status.CANCELLED_DIGGING, true);
} else if (status == ClientPlayerDiggingPacket.Status.FINISHED_DIGGING) {
final Block block = instance.getBlock(blockPosition);
if (false) {
// TODO: Handle custom block with block break delay here
} else {
// Vanilla block
breakBlock(instance, player, blockPosition, block, status);
}
// Vanilla block
breakBlock(instance, player, blockPosition, block, status);
} else if (status == ClientPlayerDiggingPacket.Status.DROP_ITEM_STACK) {
@ -163,9 +139,6 @@ public class PlayerDiggingListener {
Player player,
BlockPosition blockPosition, Block block,
ClientPlayerDiggingPacket.Status status) {
// Finished digging, remove effect if any
player.resetTargetBlock();
// Unverified block break, client is fully responsible
final boolean result = instance.breakBlock(player, blockPosition);
@ -195,48 +168,6 @@ public class PlayerDiggingListener {
}
}
/**
* Adds the effect {@link PotionEffect#DIG_SLOWDOWN} to the player.
* <p>
* Used for CustomBlock break delay or when the {@link PlayerStartDiggingEvent} is cancelled
* to remove the player break animation.
*
* @param player the player to add the effect to
*/
private static void addEffect(@NotNull Player player) {
playersEffect.add(player);
EntityEffectPacket entityEffectPacket = new EntityEffectPacket();
entityEffectPacket.entityId = player.getEntityId();
entityEffectPacket.potion = new Potion(
PotionEffect.DIG_SLOWDOWN,
(byte) -1,
0,
false,
false,
false
);
player.getPlayerConnection().sendPacket(entityEffectPacket);
}
/**
* Used to remove the affect from {@link #addEffect(Player)}.
* <p>
* Called when the player cancelled or finished digging the CustomBlock.
*
* @param player the player to remove the effect to
*/
public static void removeEffect(@NotNull Player player) {
if (playersEffect.contains(player)) {
playersEffect.remove(player);
RemoveEntityEffectPacket removeEntityEffectPacket = new RemoveEntityEffectPacket();
removeEntityEffectPacket.entityId = player.getEntityId();
removeEntityEffectPacket.effect = PotionEffect.DIG_SLOWDOWN;
player.getPlayerConnection().sendPacket(removeEntityEffectPacket);
}
}
/**
* Sends an {@link AcknowledgePlayerDiggingPacket} to a connection.
*