From ccd21d0e22ca460d490ac4377143ab35af4f5cca Mon Sep 17 00:00:00 2001 From: jascotty2 Date: Sun, 2 Jun 2019 17:25:29 -0500 Subject: [PATCH] improve event checking, cleanup imports --- .../advancedportals/listeners/Listeners.java | 30 +++++++++---------- .../listeners/PortalPlacer.java | 3 -- .../listeners/PortalProtect.java | 1 - .../advancedportals/portals/Portal.java | 8 ++++- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/sekwah/advancedportals/listeners/Listeners.java b/src/main/java/com/sekwah/advancedportals/listeners/Listeners.java index 3cd5afb..558db9b 100644 --- a/src/main/java/com/sekwah/advancedportals/listeners/Listeners.java +++ b/src/main/java/com/sekwah/advancedportals/listeners/Listeners.java @@ -6,13 +6,13 @@ import com.sekwah.advancedportals.PluginMessages; import com.sekwah.advancedportals.api.events.WarpEvent; import com.sekwah.advancedportals.portals.AdvancedPortal; import com.sekwah.advancedportals.portals.Portal; -import org.bukkit.*; -import org.bukkit.block.BlockFace; -import org.bukkit.block.BlockState; +import org.bukkit.Axis; +import org.bukkit.Bukkit; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import org.bukkit.block.data.Directional; import org.bukkit.block.data.Orientable; -import org.bukkit.block.data.Rotatable; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -76,19 +76,19 @@ public class Listeners implements Listener { Portal.cooldown.put(event.getPlayer().getName(), System.currentTimeMillis()); } - @EventHandler + @EventHandler(ignoreCancelled = true) public void onTeleportEvent(PlayerTeleportEvent event) { Portal.cooldown.put(event.getPlayer().getName(), System.currentTimeMillis()); } - @EventHandler + @EventHandler(ignoreCancelled = true) public void spawnMobEvent(CreatureSpawnEvent event) { if(event.getSpawnReason() == CreatureSpawnEvent.SpawnReason.NETHER_PORTAL && Portal.inPortalRegion(event.getLocation(), Portal.getPortalProtectionRadius())) { event.setCancelled(true); } } - @EventHandler + @EventHandler(ignoreCancelled = true) public void onLeaveEvent(PlayerQuitEvent event) { Portal.cooldown.remove(event.getPlayer().getName()); @@ -98,7 +98,7 @@ public class Listeners implements Listener { } } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onMoveEvent(PlayerMoveEvent event) { // will check if the player is in the portal or not. if (!Portal.portalsActive || event.isCancelled()) { @@ -166,29 +166,29 @@ public class Listeners implements Listener { } }; - @EventHandler + @EventHandler(ignoreCancelled = true) public void onCombustEntityEvent(EntityCombustEvent event) { - if (Portal.inPortalTriggerRegion(event.getEntity().getLocation())) + if (event.getEntity() instanceof Player && Portal.inPortalTriggerRegion(event.getEntity().getLocation())) event.setCancelled(true); } - @EventHandler + @EventHandler(ignoreCancelled = true) public void onDamEvent(EntityDamageEvent event) { - if (event.getCause() == EntityDamageEvent.DamageCause.LAVA || event.getCause() == EntityDamageEvent.DamageCause.FIRE || event.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK) { + if (event.getEntity() instanceof Player && (event.getCause() == EntityDamageEvent.DamageCause.LAVA || event.getCause() == EntityDamageEvent.DamageCause.FIRE || event.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK)) { if (event.getEntity().hasMetadata("lavaWarped") | Portal.inPortalTriggerRegion(event.getEntity().getLocation())) event.setCancelled(true); } } - @EventHandler + @EventHandler(ignoreCancelled = true) public void onPortalEvent(PlayerPortalEvent event) { Player player = event.getPlayer(); if (player.hasMetadata("hasWarped") | Portal.inPortalRegion(event.getFrom(),1)) event.setCancelled(true); } - @EventHandler + @EventHandler(ignoreCancelled = true) public void onItemInteract(PlayerInteractEvent event) { // will detect if the player is using an axe so the points of a portal can be set diff --git a/src/main/java/com/sekwah/advancedportals/listeners/PortalPlacer.java b/src/main/java/com/sekwah/advancedportals/listeners/PortalPlacer.java index 52ec6a8..ffde9d9 100644 --- a/src/main/java/com/sekwah/advancedportals/listeners/PortalPlacer.java +++ b/src/main/java/com/sekwah/advancedportals/listeners/PortalPlacer.java @@ -3,16 +3,13 @@ package com.sekwah.advancedportals.listeners; import com.sekwah.advancedportals.AdvancedPortalsPlugin; import com.sekwah.advancedportals.ConfigAccessor; import com.sekwah.advancedportals.portals.Portal; -import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.block.BlockState; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.world.ChunkLoadEvent; public class PortalPlacer implements Listener { diff --git a/src/main/java/com/sekwah/advancedportals/listeners/PortalProtect.java b/src/main/java/com/sekwah/advancedportals/listeners/PortalProtect.java index 1734eaa..5c40cee 100644 --- a/src/main/java/com/sekwah/advancedportals/listeners/PortalProtect.java +++ b/src/main/java/com/sekwah/advancedportals/listeners/PortalProtect.java @@ -4,7 +4,6 @@ import com.sekwah.advancedportals.AdvancedPortalsPlugin; import com.sekwah.advancedportals.ConfigAccessor; import com.sekwah.advancedportals.PluginMessages; import com.sekwah.advancedportals.portals.Portal; -import org.bukkit.ChatColor; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/sekwah/advancedportals/portals/Portal.java b/src/main/java/com/sekwah/advancedportals/portals/Portal.java index 26004e0..083bb4f 100644 --- a/src/main/java/com/sekwah/advancedportals/portals/Portal.java +++ b/src/main/java/com/sekwah/advancedportals/portals/Portal.java @@ -8,7 +8,13 @@ import com.sekwah.advancedportals.PluginMessages; import com.sekwah.advancedportals.api.portaldata.PortalArg; import com.sekwah.advancedportals.destinations.Destination; import com.sekwah.advancedportals.effects.WarpEffects; -import org.bukkit.*; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionAttachment;