added listener to exit pixelblock when leaving the server

This commit is contained in:
Elias Müller 2024-10-04 21:02:48 +02:00
parent ab71f09f8a
commit 92a3edc0b6
15 changed files with 45 additions and 21 deletions

View File

@ -10,7 +10,7 @@ import org.bukkit.event.Listener;
public class BreakPixelBlockListener implements Listener { public class BreakPixelBlockListener implements Listener {
@EventHandler @EventHandler
static void destroyPixelBlock(PrePlayerAttackEntityEvent event) { public void destroyPixelBlock(PrePlayerAttackEntityEvent event) {
if(!(event.getAttacked() instanceof Interaction)) return; if(!(event.getAttacked() instanceof Interaction)) return;
Location blockLocation = event.getAttacked().getLocation().add(0, Main.configuration.hitboxOffset(), 0).toBlockLocation(); Location blockLocation = event.getAttacked().getLocation().add(0, Main.configuration.hitboxOffset(), 0).toBlockLocation();

View File

@ -7,7 +7,7 @@ import org.bukkit.event.block.BlockBreakEvent;
public class BreakPixelListener implements Listener { public class BreakPixelListener implements Listener {
@EventHandler @EventHandler
static void onBlockBreak(BlockBreakEvent event) { public void onBlockBreak(BlockBreakEvent event) {
EventCanceling.shouldCancelInPixelBlock( EventCanceling.shouldCancelInPixelBlock(
event, event,
event.getBlock().getWorld(), event.getBlock().getWorld(),

View File

@ -10,7 +10,7 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
public class EnterPixelBlockListener implements Listener { public class EnterPixelBlockListener implements Listener {
@EventHandler @EventHandler
static void enterPixelBlock(PlayerInteractEntityEvent event) { public void enterPixelBlock(PlayerInteractEntityEvent event) {
if(!(event.getRightClicked() instanceof Interaction)) return; if(!(event.getRightClicked() instanceof Interaction)) return;
Location interactionLocation = event Location interactionLocation = event

View File

@ -12,7 +12,7 @@ import java.util.Objects;
public class ExitPixelWorldListener implements Listener { public class ExitPixelWorldListener implements Listener {
@EventHandler @EventHandler
static void onPlayerChangeWorld(PlayerChangedWorldEvent event) { public void onPlayerChangeWorld(PlayerChangedWorldEvent event) {
World changingFrom = event.getFrom(); World changingFrom = event.getFrom();
if(!PixelBlockWorld.isPixelWorld(changingFrom)) return; if(!PixelBlockWorld.isPixelWorld(changingFrom)) return;
@ -22,14 +22,13 @@ public class ExitPixelWorldListener implements Listener {
} }
@EventHandler @EventHandler
static void onPlayerPortal(PlayerPortalEvent event) { public void onPlayerPortal(PlayerPortalEvent event) {
World pixelBlockWorld = event.getFrom().getWorld(); World pixelBlockWorld = event.getFrom().getWorld();
if(!PixelBlockWorld.isPixelWorld(pixelBlockWorld)) return; if(!PixelBlockWorld.isPixelWorld(pixelBlockWorld)) return;
event.setCancelled(true); event.setCancelled(true);
PixelBlock pixelBlock = PixelBlock.getPixelBlockFromBlockWorld(pixelBlockWorld); PixelBlock pixelBlock = PixelBlock.getPixelBlockFromBlockWorld(pixelBlockWorld);
Objects.requireNonNull(pixelBlock); Objects.requireNonNull(pixelBlock);
event.getPlayer().teleport(pixelBlock.lastEntryLocation); pixelBlock.exitBlock(event.getPlayer());
} }
} }

View File

@ -11,7 +11,7 @@ import java.util.Objects;
public class FallOutOfPixelBlockListener implements Listener { public class FallOutOfPixelBlockListener implements Listener {
@EventHandler @EventHandler
static void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if(player.getLocation().y() > -65) return; if(player.getLocation().y() > -65) return;
if(!PixelBlockWorld.isPixelWorld(player.getWorld())) return; if(!PixelBlockWorld.isPixelWorld(player.getWorld())) return;

View File

@ -19,7 +19,7 @@ import java.util.UUID;
public class PlacePixelBlockListener implements Listener { public class PlacePixelBlockListener implements Listener {
@EventHandler @EventHandler
static void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
ItemStack usedItem = event.getItemInHand(); ItemStack usedItem = event.getItemInHand();
PixelBlockItem.BlockInfo info = PixelBlockItem.getBlockInfo(usedItem); PixelBlockItem.BlockInfo info = PixelBlockItem.getBlockInfo(usedItem);
if(info == null) return; if(info == null) return;

View File

@ -8,7 +8,7 @@ import org.bukkit.event.player.PlayerBucketEmptyEvent;
public class PlacePixelListener implements Listener { public class PlacePixelListener implements Listener {
@EventHandler @EventHandler
static void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
EventCanceling.shouldCancelInPixelBlock( EventCanceling.shouldCancelInPixelBlock(
event, event,
event.getBlock().getWorld(), event.getBlock().getWorld(),
@ -17,7 +17,7 @@ public class PlacePixelListener implements Listener {
} }
@EventHandler @EventHandler
static void onBuketEmpty(PlayerBucketEmptyEvent event) { public void onBuketEmpty(PlayerBucketEmptyEvent event) {
EventCanceling.shouldCancelInPixelBlock( EventCanceling.shouldCancelInPixelBlock(
event, event,
event.getBlock().getWorld(), event.getBlock().getWorld(),

View File

@ -7,7 +7,7 @@ import org.bukkit.event.entity.EntityPlaceEvent;
public class PreventEntityPlacementListener implements Listener { public class PreventEntityPlacementListener implements Listener {
@EventHandler @EventHandler
public static void preventPlace(EntityPlaceEvent event) { public void preventPlace(EntityPlaceEvent event) {
EventCanceling.cancelIfInPixelWorld(event, event.getBlock().getWorld()); EventCanceling.cancelIfInPixelWorld(event, event.getBlock().getWorld());
} }
} }

View File

@ -8,7 +8,7 @@ import org.bukkit.event.inventory.InventoryType;
public class PreventHopperActionsListener implements Listener { public class PreventHopperActionsListener implements Listener {
@EventHandler @EventHandler
static void onInventoryPickupItem(InventoryPickupItemEvent event) { public void onInventoryPickupItem(InventoryPickupItemEvent event) {
EventCanceling.shouldCancelInPixelBlock( EventCanceling.shouldCancelInPixelBlock(
event, event,
event.getItem().getWorld(), event.getItem().getWorld(),

View File

@ -10,22 +10,22 @@ import org.bukkit.event.entity.EntityExplodeEvent;
public class PreventIllegalBlocksListener implements Listener { public class PreventIllegalBlocksListener implements Listener {
@EventHandler @EventHandler
static void onBlockExplode(BlockExplodeEvent event) { public void onBlockExplode(BlockExplodeEvent event) {
EventCanceling.cancelIfInPixelWorld(event, event.getBlock().getWorld()); EventCanceling.cancelIfInPixelWorld(event, event.getBlock().getWorld());
} }
@EventHandler @EventHandler
static void onCreatureSpawn(CreatureSpawnEvent event) { public void onCreatureSpawn(CreatureSpawnEvent event) {
EventCanceling.cancelIfInPixelWorld(event, event.getLocation().getWorld()); EventCanceling.cancelIfInPixelWorld(event, event.getLocation().getWorld());
} }
@EventHandler @EventHandler
static void onEntityDamage(EntityDamageEvent event) { public void onEntityDamage(EntityDamageEvent event) {
EventCanceling.cancelIfInPixelWorld(event, event.getEntity().getWorld()); EventCanceling.cancelIfInPixelWorld(event, event.getEntity().getWorld());
} }
@EventHandler @EventHandler
static void onEntityExplode(EntityExplodeEvent event) { public void onEntityExplode(EntityExplodeEvent event) {
EventCanceling.cancelIfInPixelWorld(event, event.getLocation().getWorld()); EventCanceling.cancelIfInPixelWorld(event, event.getLocation().getWorld());
} }
} }

View File

@ -10,7 +10,7 @@ import org.bukkit.inventory.PlayerInventory;
public class PreventInventorysListener implements Listener { public class PreventInventorysListener implements Listener {
@EventHandler @EventHandler
static void onInventoryOpen(InventoryOpenEvent event) { public void onInventoryOpen(InventoryOpenEvent event) {
EventCanceling.shouldCancelInPixelBlock( EventCanceling.shouldCancelInPixelBlock(
event, event,
event.getPlayer().getWorld(), event.getPlayer().getWorld(),
@ -19,7 +19,7 @@ public class PreventInventorysListener implements Listener {
} }
@EventHandler @EventHandler
static void onInventoryInteract(InventoryInteractEvent event) { public void onInventoryInteract(InventoryInteractEvent event) {
EventCanceling.shouldCancelInPixelBlock( EventCanceling.shouldCancelInPixelBlock(
event, event,
event.getWhoClicked().getWorld(), event.getWhoClicked().getWorld(),

View File

@ -7,7 +7,7 @@ import org.bukkit.event.block.BlockFromToEvent;
public class PreventLiquidsFlowListener implements Listener { public class PreventLiquidsFlowListener implements Listener {
@EventHandler @EventHandler
public static void onLiquidFlow(BlockFromToEvent event) { public void onLiquidFlow(BlockFromToEvent event) {
EventCanceling.shouldCancelInPixelBlock( EventCanceling.shouldCancelInPixelBlock(
event, event,
event.getToBlock().getWorld(), event.getToBlock().getWorld(),

View File

@ -7,7 +7,7 @@ import org.bukkit.event.block.BlockPistonExtendEvent;
public class PreventPistonsListener implements Listener { public class PreventPistonsListener implements Listener {
@EventHandler @EventHandler
public static void blockPistons(BlockPistonExtendEvent event) { public void blockPistons(BlockPistonExtendEvent event) {
EventCanceling.shouldCancelInPixelBlock( EventCanceling.shouldCancelInPixelBlock(
event, event,
event.getBlock().getWorld(), event.getBlock().getWorld(),

View File

@ -0,0 +1,21 @@
package eu.mhsl.minecraft.pixelblocks.listeners;
import eu.mhsl.minecraft.pixelblocks.pixelblock.PixelBlock;
import eu.mhsl.minecraft.pixelblocks.pixelblock.PixelBlockWorld;
import org.bukkit.World;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
import java.util.Objects;
public class QuitWhileInPixelBlockListener implements Listener {
@EventHandler
public void onLeave(PlayerQuitEvent event) {
World pixelBlockWorld = event.getPlayer().getLocation().getWorld();
if(!PixelBlockWorld.isPixelWorld(pixelBlockWorld)) return;
PixelBlock pixelBlock = PixelBlock.getPixelBlockFromBlockWorld(pixelBlockWorld);
Objects.requireNonNull(pixelBlock);
pixelBlock.exitBlock(event.getPlayer());
}
}

View File

@ -102,6 +102,10 @@ public class PixelBlock {
.execute(); .execute();
} }
public void exitBlock(@NotNull Player player) {
player.teleport(this.lastEntryLocation);
}
public void setLastEntryLocation(Location lastEntryLocation) { public void setLastEntryLocation(Location lastEntryLocation) {
this.lastEntryLocation = lastEntryLocation; this.lastEntryLocation = lastEntryLocation;
} }