From ccd21d0e22ca460d490ac4377143ab35af4f5cca Mon Sep 17 00:00:00 2001 From: jascotty2 Date: Sun, 2 Jun 2019 17:25:29 -0500 Subject: [PATCH 1/2] 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; From e37ec1bef65d282c7c83878ca4b35a2a0e5f2e3a Mon Sep 17 00:00:00 2001 From: Sekwah Date: Mon, 3 Jun 2019 03:11:34 +0100 Subject: [PATCH 2/2] Removed useless comments --- .../sekwah/advancedportals/AdvancedPortalsCommand.java | 5 ++++- .../sekwah/advancedportals/AdvancedPortalsPlugin.java | 2 -- .../advancedportals/api/portaldata/PortalTags.java | 7 ------- .../advancedportals/api/registry/TagRegistry.java | 5 ----- .../api/warphandler/ActivationData.java | 5 ----- .../advancedportals/api/warphandler/TagHandler.java | 5 ----- .../com/sekwah/advancedportals/compat/CraftBukkit.java | 10 ---------- .../advancedportals/destinations/PortalWarp.java | 7 ------- .../advancedportals/listeners/BungeeListener.java | 5 ----- .../sekwah/advancedportals/listeners/Listeners.java | 6 +----- .../sekwah/advancedportals/portals/AdvancedPortal.java | 5 ++++- .../com/sekwah/advancedportals/portals/Portal.java | 8 +------- 12 files changed, 10 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/sekwah/advancedportals/AdvancedPortalsCommand.java b/src/main/java/com/sekwah/advancedportals/AdvancedPortalsCommand.java index 5b976e8..720dcca 100644 --- a/src/main/java/com/sekwah/advancedportals/AdvancedPortalsCommand.java +++ b/src/main/java/com/sekwah/advancedportals/AdvancedPortalsCommand.java @@ -5,7 +5,10 @@ import com.sekwah.advancedportals.api.portaldata.PortalArg; import com.sekwah.advancedportals.listeners.Listeners; import com.sekwah.advancedportals.portals.AdvancedPortal; import com.sekwah.advancedportals.portals.Portal; -import org.bukkit.*; +import org.bukkit.DyeColor; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/sekwah/advancedportals/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/AdvancedPortalsPlugin.java index 31e5d4d..9358076 100644 --- a/src/main/java/com/sekwah/advancedportals/AdvancedPortalsPlugin.java +++ b/src/main/java/com/sekwah/advancedportals/AdvancedPortalsPlugin.java @@ -10,8 +10,6 @@ import com.sekwah.advancedportals.portals.Portal; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import java.io.*; - public class AdvancedPortalsPlugin extends JavaPlugin { public CraftBukkit compat = null; diff --git a/src/main/java/com/sekwah/advancedportals/api/portaldata/PortalTags.java b/src/main/java/com/sekwah/advancedportals/api/portaldata/PortalTags.java index 994f745..2609eac 100644 --- a/src/main/java/com/sekwah/advancedportals/api/portaldata/PortalTags.java +++ b/src/main/java/com/sekwah/advancedportals/api/portaldata/PortalTags.java @@ -4,13 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -/** - * Created by on 29/03/2016. - *

- * TODO add all the normal tags then add the extradata tags - * - * @author sekwah41 - */ public class PortalTags { // TODO create a list or hashmap of tags to check for. diff --git a/src/main/java/com/sekwah/advancedportals/api/registry/TagRegistry.java b/src/main/java/com/sekwah/advancedportals/api/registry/TagRegistry.java index d0916db..86f45e8 100644 --- a/src/main/java/com/sekwah/advancedportals/api/registry/TagRegistry.java +++ b/src/main/java/com/sekwah/advancedportals/api/registry/TagRegistry.java @@ -7,11 +7,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -/** - * Created by on 25/07/2016. - * - * @author sekwah41 - */ public class TagRegistry { private final AdvancedPortalsPlugin plugin; diff --git a/src/main/java/com/sekwah/advancedportals/api/warphandler/ActivationData.java b/src/main/java/com/sekwah/advancedportals/api/warphandler/ActivationData.java index bb8fa11..f18c4f9 100644 --- a/src/main/java/com/sekwah/advancedportals/api/warphandler/ActivationData.java +++ b/src/main/java/com/sekwah/advancedportals/api/warphandler/ActivationData.java @@ -2,11 +2,6 @@ package com.sekwah.advancedportals.api.warphandler; import com.sekwah.advancedportals.portals.Portal; -/** - * Created by on 30/07/2016. - * - * @author sekwah41 - */ public class ActivationData { private boolean warpAllowed = true; diff --git a/src/main/java/com/sekwah/advancedportals/api/warphandler/TagHandler.java b/src/main/java/com/sekwah/advancedportals/api/warphandler/TagHandler.java index bfe97e9..8def9ec 100644 --- a/src/main/java/com/sekwah/advancedportals/api/warphandler/TagHandler.java +++ b/src/main/java/com/sekwah/advancedportals/api/warphandler/TagHandler.java @@ -2,11 +2,6 @@ package com.sekwah.advancedportals.api.warphandler; import org.bukkit.entity.Player; -/** - * Created by on 30/07/2016. - * - * @author sekwah41 - */ public class TagHandler { public interface Creation{ diff --git a/src/main/java/com/sekwah/advancedportals/compat/CraftBukkit.java b/src/main/java/com/sekwah/advancedportals/compat/CraftBukkit.java index 98b3c3c..93dba54 100644 --- a/src/main/java/com/sekwah/advancedportals/compat/CraftBukkit.java +++ b/src/main/java/com/sekwah/advancedportals/compat/CraftBukkit.java @@ -2,8 +2,6 @@ package com.sekwah.advancedportals.compat; import com.sekwah.advancedportals.AdvancedPortalsPlugin; import com.sekwah.advancedportals.reflection.ReflectionHelper; -import org.bukkit.World; -import org.bukkit.block.Block; import org.bukkit.entity.Player; import java.lang.reflect.Constructor; @@ -11,14 +9,6 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -/** - * Created by on 02/08/2016. - * - * I don't think there will be any others supported other than bukkit but if there are its not just the compat that will - * need to change unless it has a different package for the minecraft server parts - * - * @author sekwah41 maxqia - */ public class CraftBukkit { private final AdvancedPortalsPlugin plugin; diff --git a/src/main/java/com/sekwah/advancedportals/destinations/PortalWarp.java b/src/main/java/com/sekwah/advancedportals/destinations/PortalWarp.java index eccfa05..54b0ae8 100644 --- a/src/main/java/com/sekwah/advancedportals/destinations/PortalWarp.java +++ b/src/main/java/com/sekwah/advancedportals/destinations/PortalWarp.java @@ -1,12 +1,5 @@ package com.sekwah.advancedportals.destinations; -/** - * Created by on 04/08/2016. - * - * TODO load the destinations into memory rather than constantly reading from the yml. - * - * @author sekwah41 - */ public class PortalWarp { } diff --git a/src/main/java/com/sekwah/advancedportals/listeners/BungeeListener.java b/src/main/java/com/sekwah/advancedportals/listeners/BungeeListener.java index 2e88c37..64273dd 100644 --- a/src/main/java/com/sekwah/advancedportals/listeners/BungeeListener.java +++ b/src/main/java/com/sekwah/advancedportals/listeners/BungeeListener.java @@ -6,11 +6,6 @@ import com.sekwah.advancedportals.AdvancedPortalsPlugin; import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; -/** - * Created by on 29/03/2016. - * - * @author sekwah41 - */ public class BungeeListener implements PluginMessageListener { private AdvancedPortalsPlugin plugin; diff --git a/src/main/java/com/sekwah/advancedportals/listeners/Listeners.java b/src/main/java/com/sekwah/advancedportals/listeners/Listeners.java index e504578..3be1978 100644 --- a/src/main/java/com/sekwah/advancedportals/listeners/Listeners.java +++ b/src/main/java/com/sekwah/advancedportals/listeners/Listeners.java @@ -6,11 +6,7 @@ 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.Axis; -import org.bukkit.Bukkit; -import org.bukkit.GameMode; -import org.bukkit.Location; -import org.bukkit.Material; +import org.bukkit.*; import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Orientable; import org.bukkit.entity.Player; diff --git a/src/main/java/com/sekwah/advancedportals/portals/AdvancedPortal.java b/src/main/java/com/sekwah/advancedportals/portals/AdvancedPortal.java index 60db8c9..47e5136 100644 --- a/src/main/java/com/sekwah/advancedportals/portals/AdvancedPortal.java +++ b/src/main/java/com/sekwah/advancedportals/portals/AdvancedPortal.java @@ -4,7 +4,10 @@ import com.sekwah.advancedportals.api.portaldata.PortalArg; import org.bukkit.Location; import org.bukkit.Material; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; public class AdvancedPortal { diff --git a/src/main/java/com/sekwah/advancedportals/portals/Portal.java b/src/main/java/com/sekwah/advancedportals/portals/Portal.java index d0ce148..2ea187a 100644 --- a/src/main/java/com/sekwah/advancedportals/portals/Portal.java +++ b/src/main/java/com/sekwah/advancedportals/portals/Portal.java @@ -8,13 +8,7 @@ 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.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.*; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionAttachment;