From a70fe174bf9b688e0d447df4bba2621d22362528 Mon Sep 17 00:00:00 2001 From: TheMode Date: Mon, 14 Jun 2021 15:26:16 +0200 Subject: [PATCH] Fix rebase --- .../minestom/server/event/player/PlayerBlockBreakEvent.java | 2 -- .../server/event/player/PlayerBlockInteractEvent.java | 5 +---- src/main/java/net/minestom/server/instance/Instance.java | 4 ++-- .../java/net/minestom/server/instance/InstanceContainer.java | 2 +- .../net/minestom/server/listener/BlockPlacementListener.java | 2 +- .../net/minestom/server/listener/PlayerDiggingListener.java | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java b/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java index 573e9fcbc..bd5ee3ecb 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerBlockBreakEvent.java @@ -3,8 +3,6 @@ package net.minestom.server.event.player; import net.minestom.server.entity.Player; import net.minestom.server.event.trait.CancellableEvent; 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.utils.BlockPosition; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java b/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java index 57f0f0612..76d9480f7 100644 --- a/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java +++ b/src/main/java/net/minestom/server/event/player/PlayerBlockInteractEvent.java @@ -1,9 +1,6 @@ package net.minestom.server.event.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.PlayerEvent; import net.minestom.server.instance.block.Block; @@ -31,7 +28,7 @@ public class PlayerBlockInteractEvent implements PlayerEvent, CancellableEvent { 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 BlockFace blockFace) { this.player = player; diff --git a/src/main/java/net/minestom/server/instance/Instance.java b/src/main/java/net/minestom/server/instance/Instance.java index f0fa9ca31..2b3f51cb2 100644 --- a/src/main/java/net/minestom/server/instance/Instance.java +++ b/src/main/java/net/minestom/server/instance/Instance.java @@ -16,8 +16,6 @@ import net.minestom.server.event.EventCallback; import net.minestom.server.event.EventDispatcher; import net.minestom.server.event.EventFilter; 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.InstanceTickEvent; 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.Nullable; +import net.minestom.server.event.handler.EventHandler; + import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; diff --git a/src/main/java/net/minestom/server/instance/InstanceContainer.java b/src/main/java/net/minestom/server/instance/InstanceContainer.java index 269371ab8..8485deaa6 100644 --- a/src/main/java/net/minestom/server/instance/InstanceContainer.java +++ b/src/main/java/net/minestom/server/instance/InstanceContainer.java @@ -275,7 +275,7 @@ public class InstanceContainer extends Instance { } PlayerBlockBreakEvent blockBreakEvent = new PlayerBlockBreakEvent(player, block, Block.AIR, blockPosition); - EventDispatcher.call(PlayerBlockBreakEvent.class, blockBreakEvent); + EventDispatcher.call(blockBreakEvent); final boolean allowed = !blockBreakEvent.isCancelled(); if (allowed) { // Break or change the broken block based on event result diff --git a/src/main/java/net/minestom/server/listener/BlockPlacementListener.java b/src/main/java/net/minestom/server/listener/BlockPlacementListener.java index 3e5f02049..531c7c9c2 100644 --- a/src/main/java/net/minestom/server/listener/BlockPlacementListener.java +++ b/src/main/java/net/minestom/server/listener/BlockPlacementListener.java @@ -54,7 +54,7 @@ public class BlockPlacementListener { // Interact at block // FIXME: onUseOnBlock PlayerBlockInteractEvent playerBlockInteractEvent = new PlayerBlockInteractEvent(player, hand, interactedBlock, blockPosition, blockFace); - player.callEvent(PlayerBlockInteractEvent.class, playerBlockInteractEvent); + EventDispatcher.call(playerBlockInteractEvent); if (playerBlockInteractEvent.isBlockingItemUse()) { return; } diff --git a/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java index e3b4c1b86..ed5c109e1 100644 --- a/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java +++ b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java @@ -64,7 +64,7 @@ public class PlayerDiggingListener { breakBlock(instance, player, blockPosition, block, status); } else { PlayerStartDiggingEvent playerStartDiggingEvent = new PlayerStartDiggingEvent(player, block, blockPosition); - EventDispatcher.call(PlayerStartDiggingEvent.class, playerStartDiggingEvent); + EventDispatcher.call(playerStartDiggingEvent); if (playerStartDiggingEvent.isCancelled()) { addEffect(player);