Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renamed AbstractFlagListener to FlagListener

This commit is contained in:
Florian CUNY 2018-11-04 16:40:20 +01:00
parent 16329d9372
commit 09905ab018
34 changed files with 71 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/bentobox/api/flags/AbstractFlagListener.java → src/main/java/world/bentobox/bentobox/api/flags/FlagListener.java
View File

@ -23,7 +23,7 @@ import world.bentobox.bentobox.util.Util;
* @author tastybento
*
*/
public abstract class AbstractFlagListener implements Listener {
public abstract class FlagListener implements Listener {
/**
* Reason for why flag was allowed or disallowed
@ -89,7 +89,7 @@ public abstract class AbstractFlagListener implements Listener {
* Explicitly set the user for the next {@link #checkIsland(Event, Location, Flag)} or {@link #checkIsland(Event, Location, Flag, boolean)}
* @param user - the User
*/
public AbstractFlagListener setUser(User user) {
public FlagListener setUser(User user) {
if (!plugin.getSettings().getFakePlayers().contains(user.getName())) {
this.user = user;
}

4
src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java
View File

@ -9,14 +9,14 @@ import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
* @author tastybento
*
*/
public class BlockInteractionListener extends AbstractFlagListener {
public class BlockInteractionListener extends FlagListener {
/**
* Handle interaction with blocks

4
src/main/java/world/bentobox/bentobox/listeners/flags/BreakBlocksListener.java
View File

@ -16,11 +16,11 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.vehicle.VehicleDamageEvent;
import org.bukkit.util.BlockIterator;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
public class BreakBlocksListener extends AbstractFlagListener {
public class BreakBlocksListener extends FlagListener {
/**
* Prevents blocks from being broken

4
src/main/java/world/bentobox/bentobox/listeners/flags/BreedingListener.java
View File

@ -11,7 +11,7 @@ import org.bukkit.event.player.PlayerInteractAtEntityEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -20,7 +20,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class BreedingListener extends AbstractFlagListener {
public class BreedingListener extends FlagListener {
/**
* A list of items that cause breeding if a player has them in their hand and they click an animal

4
src/main/java/world/bentobox/bentobox/listeners/flags/BucketListener.java
View File

@ -7,7 +7,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerBucketEmptyEvent;
import org.bukkit.event.player.PlayerBucketFillEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -16,7 +16,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class BucketListener extends AbstractFlagListener {
public class BucketListener extends FlagListener {
/**
* Prevents emptying of buckets

4
src/main/java/world/bentobox/bentobox/listeners/flags/ChestDamageListener.java
View File

@ -8,14 +8,14 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityExplodeEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
* @author tastybento
*
*/
public class ChestDamageListener extends AbstractFlagListener {
public class ChestDamageListener extends FlagListener {
/**
* Prevent chest damage from explosion
* @param e - event

4
src/main/java/world/bentobox/bentobox/listeners/flags/CleanSuperFlatListener.java
View File

@ -11,7 +11,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.world.ChunkLoadEvent;
import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -20,7 +20,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class CleanSuperFlatListener extends AbstractFlagListener {
public class CleanSuperFlatListener extends FlagListener {
@SuppressWarnings("deprecation")
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onChunkLoad(ChunkLoadEvent e) {

4
src/main/java/world/bentobox/bentobox/listeners/flags/CreeperListener.java
View File

@ -10,7 +10,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityExplodeEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
@ -22,7 +22,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class CreeperListener extends AbstractFlagListener {
public class CreeperListener extends FlagListener {
/**
* Prevent damage from explosion

4
src/main/java/world/bentobox/bentobox/listeners/flags/EggListener.java
View File

@ -4,7 +4,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerEggThrowEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -12,7 +12,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class EggListener extends AbstractFlagListener {
public class EggListener extends FlagListener {
/**
* Handle visitor chicken egg throwing

4
src/main/java/world/bentobox/bentobox/listeners/flags/EnderChestListener.java
View File

@ -11,7 +11,7 @@ import org.bukkit.event.block.Action;
import org.bukkit.event.inventory.CraftItemEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
@ -21,7 +21,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class EnderChestListener extends AbstractFlagListener {
public class EnderChestListener extends FlagListener {
/**
* Prevents opening ender chest unless player has permission

4
src/main/java/world/bentobox/bentobox/listeners/flags/EndermanListener.java
View File

@ -8,7 +8,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityChangeBlockEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -18,7 +18,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class EndermanListener extends AbstractFlagListener {
public class EndermanListener extends FlagListener {
/**
* Allows or prevents enderman griefing
*/

4
src/main/java/world/bentobox/bentobox/listeners/flags/EnterExitListener.java
View File

@ -13,7 +13,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.util.Vector;
import world.bentobox.bentobox.api.events.island.IslandEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
@ -24,7 +24,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class EnterExitListener extends AbstractFlagListener {
public class EnterExitListener extends FlagListener {
private static final Vector XZ = new Vector(1,0,1);

4
src/main/java/world/bentobox/bentobox/listeners/flags/EntityInteractListener.java
View File

@ -9,7 +9,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerInteractAtEntityEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -18,7 +18,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class EntityInteractListener extends AbstractFlagListener {
public class EntityInteractListener extends FlagListener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled=true)
public void onPlayerInteract(final PlayerInteractAtEntityEvent e) {

4
src/main/java/world/bentobox/bentobox/listeners/flags/FireListener.java
View File

@ -13,7 +13,7 @@ import org.bukkit.event.block.BlockSpreadEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.util.BlockIterator;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.lists.Flags;
@ -22,7 +22,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class FireListener extends AbstractFlagListener {
public class FireListener extends FlagListener {
/**
* Checks if fire is allowed. If not, cancels the action

4
src/main/java/world/bentobox/bentobox/listeners/flags/GeoLimitMobsListener.java
View File

@ -17,7 +17,7 @@ import org.bukkit.event.entity.ExplosionPrimeEvent;
import org.bukkit.projectiles.ProjectileSource;
import world.bentobox.bentobox.api.events.BentoBoxReadyEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.database.objects.Island;
/**
@ -25,7 +25,7 @@ import world.bentobox.bentobox.database.objects.Island;
* @author tastybento
*
*/
public class GeoLimitMobsListener extends AbstractFlagListener {
public class GeoLimitMobsListener extends FlagListener {
private Map<Entity, Island> mobSpawnTracker = new WeakHashMap<>();

4
src/main/java/world/bentobox/bentobox/listeners/flags/HurtingListener.java
View File

@ -27,7 +27,7 @@ import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.potion.PotionEffect;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
@ -37,7 +37,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class HurtingListener extends AbstractFlagListener {
public class HurtingListener extends FlagListener {
private HashMap<Integer, UUID> thrownPotions = new HashMap<>();

4
src/main/java/world/bentobox/bentobox/listeners/flags/InventoryListener.java
View File

@ -13,7 +13,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.inventory.InventoryClickEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
@ -22,7 +22,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class InventoryListener extends AbstractFlagListener {
public class InventoryListener extends FlagListener {
/**
* Prevents visitors picking items from inventories

4
src/main/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListener.java
View File

@ -17,7 +17,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.inventory.ClickType;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.panels.Panel;
import world.bentobox.bentobox.api.panels.PanelItem;
import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
@ -32,7 +32,7 @@ import world.bentobox.bentobox.util.teleport.SafeSpotTeleport;
* @author tastybento
*
*/
public class InvincibleVisitorsListener extends AbstractFlagListener implements ClickHandler {
public class InvincibleVisitorsListener extends FlagListener implements ClickHandler {
@Override
public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {

4
src/main/java/world/bentobox/bentobox/listeners/flags/IslandRespawnListener.java
View File

@ -14,7 +14,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
@ -23,7 +23,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class IslandRespawnListener extends AbstractFlagListener {
public class IslandRespawnListener extends FlagListener {
Map<UUID, World> respawn = new HashMap<>();

4
src/main/java/world/bentobox/bentobox/listeners/flags/ItemDropPickUpListener.java
View File

@ -6,14 +6,14 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityPickupItemEvent;
import org.bukkit.event.player.PlayerDropItemEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
/**
* @author tastybento
*/
public class ItemDropPickUpListener extends AbstractFlagListener {
public class ItemDropPickUpListener extends FlagListener {
/*
* Handle item drop

4
src/main/java/world/bentobox/bentobox/listeners/flags/ItemFrameListener.java
View File

@ -13,7 +13,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -21,7 +21,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class ItemFrameListener extends AbstractFlagListener {
public class ItemFrameListener extends FlagListener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onItemFrameDamage(final EntityDamageByEntityEvent e) {

4
src/main/java/world/bentobox/bentobox/listeners/flags/LeashListener.java
View File

@ -7,14 +7,14 @@ import org.bukkit.event.entity.PlayerLeashEntityEvent;
import org.bukkit.event.hanging.HangingPlaceEvent;
import org.bukkit.event.player.PlayerUnleashEntityEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
* @author tastybento
*
*/
public class LeashListener extends AbstractFlagListener {
public class LeashListener extends FlagListener {
/**
* Prevents leashing

4
src/main/java/world/bentobox/bentobox/listeners/flags/MobSpawnListener.java
View File

@ -10,7 +10,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.lists.Flags;
@ -19,7 +19,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class MobSpawnListener extends AbstractFlagListener {
public class MobSpawnListener extends FlagListener {
/**
* Prevents mobs spawning naturally

4
src/main/java/world/bentobox/bentobox/listeners/flags/OfflineRedstoneListener.java
View File

@ -7,10 +7,10 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockRedstoneEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
public class OfflineRedstoneListener extends AbstractFlagListener {
public class OfflineRedstoneListener extends FlagListener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onBlockRedstone(BlockRedstoneEvent e) {

4
src/main/java/world/bentobox/bentobox/listeners/flags/PVPListener.java
View File

@ -20,7 +20,7 @@ import org.bukkit.event.entity.LingeringPotionSplashEvent;
import org.bukkit.event.entity.PotionSplashEvent;
import org.bukkit.event.player.PlayerFishEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
@ -30,7 +30,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class PVPListener extends AbstractFlagListener {
public class PVPListener extends FlagListener {
private HashMap<Integer, UUID> thrownPotions = new HashMap<>();

4
src/main/java/world/bentobox/bentobox/listeners/flags/PhysicalInteractionListener.java
View File

@ -8,7 +8,7 @@ import org.bukkit.event.block.Action;
import org.bukkit.event.entity.EntityInteractEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
@ -16,7 +16,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class PhysicalInteractionListener extends AbstractFlagListener {
public class PhysicalInteractionListener extends FlagListener {
/**
* Handle physical interaction with blocks

4
src/main/java/world/bentobox/bentobox/listeners/flags/PistonPushListener.java
View File

@ -7,7 +7,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockPistonExtendEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -15,7 +15,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class PistonPushListener extends AbstractFlagListener {
public class PistonPushListener extends FlagListener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPistonExtend(BlockPistonExtendEvent e) {

4
src/main/java/world/bentobox/bentobox/listeners/flags/PlaceBlocksListener.java
View File

@ -12,14 +12,14 @@ import org.bukkit.event.block.EntityBlockFormEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
/**
* @author tastybento
*/
public class PlaceBlocksListener extends AbstractFlagListener {
public class PlaceBlocksListener extends FlagListener {
/**
* Check blocks being placed in general

4
src/main/java/world/bentobox/bentobox/listeners/flags/PortalListener.java
View File

@ -5,7 +5,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerPortalEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -13,7 +13,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class PortalListener extends AbstractFlagListener {
public class PortalListener extends FlagListener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerPortal(PlayerPortalEvent e) {

4
src/main/java/world/bentobox/bentobox/listeners/flags/RemoveMobsListener.java
View File

@ -7,7 +7,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerTeleportEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -15,7 +15,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class RemoveMobsListener extends AbstractFlagListener {
public class RemoveMobsListener extends FlagListener {
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onUserTeleport(PlayerTeleportEvent e) {

4
src/main/java/world/bentobox/bentobox/listeners/flags/ShearingListener.java
View File

@ -4,7 +4,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerShearEntityEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -12,7 +12,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class ShearingListener extends AbstractFlagListener {
public class ShearingListener extends FlagListener {
// Protect sheep
@EventHandler(priority = EventPriority.LOW)

4
src/main/java/world/bentobox/bentobox/listeners/flags/TNTListener.java
View File

@ -14,7 +14,7 @@ import org.bukkit.event.entity.EntityChangeBlockEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.lists.Flags;
@ -23,7 +23,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class TNTListener extends AbstractFlagListener {
public class TNTListener extends FlagListener {
/**
* Protect TNT from being set light by a fire arrow

4
src/main/java/world/bentobox/bentobox/listeners/flags/TeleportationListener.java
View File

@ -5,7 +5,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.lists.Flags;
/**
@ -13,7 +13,7 @@ import world.bentobox.bentobox.lists.Flags;
* @author tastybento
*
*/
public class TeleportationListener extends AbstractFlagListener {
public class TeleportationListener extends FlagListener {
/**
* Ender pearl and chorus fruit teleport checks

12
src/test/java/world/bentobox/bentobox/TestBentoBox.java
View File

@ -48,14 +48,12 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.Settings;
import world.bentobox.bentobox.api.commands.CompositeCommand;
import world.bentobox.bentobox.api.events.IslandBaseEvent;
import world.bentobox.bentobox.api.events.team.TeamEvent;
import world.bentobox.bentobox.api.flags.AbstractFlagListener;
import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.api.flags.FlagBuilder;
import world.bentobox.bentobox.api.flags.FlagListener;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.lists.Flags;
@ -468,7 +466,7 @@ public class TestBentoBox {
public void testEventProtection() {
// Test events
FlagListener fl = new FlagListener(plugin);
TestFlagListener fl = new TestFlagListener(plugin);
// checking events - vistor
Event e3 = new BlockBreakEvent(block, visitorToIsland);
@ -501,7 +499,7 @@ public class TestBentoBox {
@Test
public void testCustomFlags() {
// Custom
FlagListener fl = new FlagListener(plugin);
TestFlagListener fl = new TestFlagListener(plugin);
Flag customFlag = new FlagBuilder().id("CUSTOM_FLAG").icon(Material.DIAMOND).listener(fl).build();
assertEquals("CUSTOM_FLAG", customFlag.getID());
assertEquals(Material.DIAMOND, customFlag.getIcon());
@ -515,8 +513,8 @@ public class TestBentoBox {
* Dummy flag listener
*
*/
private class FlagListener extends AbstractFlagListener {
FlagListener(BentoBox plugin) {
private class TestFlagListener extends FlagListener {
TestFlagListener(BentoBox plugin) {
// Set the plugin explicitly
setPlugin(plugin);
}