Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-01 04:51:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix rebase

Browse Source
This commit is contained in:
TheMode 2021-06-14 15:26:16 +02:00
parent 63004cf4ba
commit a70fe174bf
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java
View File

@ -3,8 +3,6 @@ package net.minestom.server.event.player;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.CancellableEvent;
import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.event.trait.PlayerEvent;
import net.minestom.server.event.CancellableEvent;
import net.minestom.server.event.PlayerEvent;
import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.Block;
import net.minestom.server.utils.BlockPosition; import net.minestom.server.utils.BlockPosition;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

5
src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java
View File

@ -1,9 +1,6 @@
package net.minestom.server.event.player; package net.minestom.server.event.player;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.event.CancellableEvent;
import net.minestom.server.event.PlayerEvent;
import net.minestom.server.instance.block.Block;
import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.CancellableEvent;
import net.minestom.server.event.trait.PlayerEvent; import net.minestom.server.event.trait.PlayerEvent;
import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.Block;
@ -31,7 +28,7 @@ public class PlayerBlockInteractEvent implements PlayerEvent, CancellableEvent {
private boolean cancelled; private boolean cancelled;
public PlayerBlockInteractEvent(@NotNull Player player,@NotNull Player.Hand hand, public PlayerBlockInteractEvent(@NotNull Player player, @NotNull Player.Hand hand,
@NotNull Block block, @NotNull BlockPosition blockPosition, @NotNull Block block, @NotNull BlockPosition blockPosition,
@NotNull BlockFace blockFace) { @NotNull BlockFace blockFace) {
this.player = player; this.player = player;

4
src/main/java/net/minestom/server/instance/Instance.java
View File

@ -16,8 +16,6 @@ import net.minestom.server.event.EventCallback;
import net.minestom.server.event.EventDispatcher; import net.minestom.server.event.EventDispatcher;
import net.minestom.server.event.EventFilter; import net.minestom.server.event.EventFilter;
import net.minestom.server.event.EventNode; import net.minestom.server.event.EventNode;
import net.minestom.server.event.InstanceEvent;
import net.minestom.server.event.handler.EventHandler;
import net.minestom.server.event.instance.AddEntityToInstanceEvent; import net.minestom.server.event.instance.AddEntityToInstanceEvent;
import net.minestom.server.event.instance.InstanceTickEvent; import net.minestom.server.event.instance.InstanceTickEvent;
import net.minestom.server.event.instance.RemoveEntityFromInstanceEvent; import net.minestom.server.event.instance.RemoveEntityFromInstanceEvent;
@ -45,6 +43,8 @@ import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import net.minestom.server.event.handler.EventHandler;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer; import java.util.function.Consumer;

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

@ -275,7 +275,7 @@ public class InstanceContainer extends Instance {
} }
PlayerBlockBreakEvent blockBreakEvent = new PlayerBlockBreakEvent(player, block, Block.AIR, blockPosition); PlayerBlockBreakEvent blockBreakEvent = new PlayerBlockBreakEvent(player, block, Block.AIR, blockPosition);
EventDispatcher.call(PlayerBlockBreakEvent.class, blockBreakEvent); EventDispatcher.call(blockBreakEvent);
final boolean allowed = !blockBreakEvent.isCancelled(); final boolean allowed = !blockBreakEvent.isCancelled();
if (allowed) { if (allowed) {
// Break or change the broken block based on event result // Break or change the broken block based on event result

2
src/main/java/net/minestom/server/listener/BlockPlacementListener.java
View File

@ -54,7 +54,7 @@ public class BlockPlacementListener {
// Interact at block // Interact at block
// FIXME: onUseOnBlock // FIXME: onUseOnBlock
PlayerBlockInteractEvent playerBlockInteractEvent = new PlayerBlockInteractEvent(player, hand, interactedBlock, blockPosition, blockFace); PlayerBlockInteractEvent playerBlockInteractEvent = new PlayerBlockInteractEvent(player, hand, interactedBlock, blockPosition, blockFace);
player.callEvent(PlayerBlockInteractEvent.class, playerBlockInteractEvent); EventDispatcher.call(playerBlockInteractEvent);
if (playerBlockInteractEvent.isBlockingItemUse()) { if (playerBlockInteractEvent.isBlockingItemUse()) {
return; return;
} }

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

@ -64,7 +64,7 @@ public class PlayerDiggingListener {
breakBlock(instance, player, blockPosition, block, status); breakBlock(instance, player, blockPosition, block, status);
} else { } else {
PlayerStartDiggingEvent playerStartDiggingEvent = new PlayerStartDiggingEvent(player, block, blockPosition); PlayerStartDiggingEvent playerStartDiggingEvent = new PlayerStartDiggingEvent(player, block, blockPosition);
EventDispatcher.call(PlayerStartDiggingEvent.class, playerStartDiggingEvent); EventDispatcher.call(playerStartDiggingEvent);
if (playerStartDiggingEvent.isCancelled()) { if (playerStartDiggingEvent.isCancelled()) {
addEffect(player); addEffect(player);