diff --git a/src/main/java/world/bentobox/bentobox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java index ee0fd48c8..981addb44 100644 --- a/src/main/java/world/bentobox/bentobox/BentoBox.java +++ b/src/main/java/world/bentobox/bentobox/BentoBox.java @@ -30,7 +30,20 @@ import world.bentobox.bentobox.listeners.JoinLeaveListener; import world.bentobox.bentobox.listeners.PanelListenerManager; import world.bentobox.bentobox.listeners.PortalTeleportationListener; import world.bentobox.bentobox.listeners.StandardSpawnProtectionListener; -import world.bentobox.bentobox.managers.*; +import world.bentobox.bentobox.managers.AddonsManager; +import world.bentobox.bentobox.managers.BlueprintsManager; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.HooksManager; +import world.bentobox.bentobox.managers.IslandChunkDeletionManager; +import world.bentobox.bentobox.managers.IslandDeletionManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlaceholdersManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.managers.RanksManager; +import world.bentobox.bentobox.managers.WebManager; import world.bentobox.bentobox.util.heads.HeadGetter; import world.bentobox.bentobox.versions.ServerCompatibility; diff --git a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonDisableEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonDisableEvent.java index 24e384702..10cb2f584 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonDisableEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonDisableEvent.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.api.events.addon; import java.util.Map; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.addons.Addon; /** diff --git a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEnableEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEnableEvent.java index 0b15d1ff2..126f74c2b 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEnableEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEnableEvent.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.api.events.addon; import java.util.Map; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.addons.Addon; /** diff --git a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonGeneralEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonGeneralEvent.java index 8d6a70931..5b7eab672 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonGeneralEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonGeneralEvent.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.api.events.addon; import java.util.Map; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.addons.Addon; /** diff --git a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonLoadEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonLoadEvent.java index 4228ff623..dfd02ef25 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/addon/AddonLoadEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonLoadEvent.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.api.events.addon; import java.util.Map; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.addons.Addon; /** diff --git a/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java b/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java index 2686d6a84..b248f7f99 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java @@ -5,8 +5,8 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.BentoBoxEvent; /** diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java index 1b6f3c018..13a9bea71 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.api.events.flags; import java.util.UUID; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.flags.Flag; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java index bbe6d8d0c..45a4874ab 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.api.events.flags; import java.util.UUID; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.flags.Flag; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java index 307542a82..6c8e7f94a 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.World; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.flags.Flag; /** diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandBanEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandBanEvent.java index fb078e00e..c1e5b3a4f 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandBanEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandBanEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreatedEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreatedEvent.java index dcfb602cf..303a7ab03 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreatedEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandCreatedEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteChunksEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteChunksEvent.java index 380da8974..f05ebabdf 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteChunksEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteChunksEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.IslandDeletion; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteEvent.java index 4a46eba36..dec404e22 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeleteEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeletedEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeletedEvent.java index b566f9b32..f3d31de98 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeletedEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandDeletedEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.IslandDeletion; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandExpelEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandExpelEvent.java index f60d1a770..f412810fd 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandExpelEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandExpelEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandGeneralEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandGeneralEvent.java index c8f9cc3ae..597f9caf8 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandGeneralEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandGeneralEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandLockEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandLockEvent.java index 9783c9e1c..39322bd13 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandLockEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandLockEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandNewIslandEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandNewIslandEvent.java index 583cbea40..babdb66be 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandNewIslandEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandNewIslandEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreCreateEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreCreateEvent.java index 99fa17e2f..698ab59c1 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreCreateEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandPreCreateEvent.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.api.events.island; import java.util.UUID; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; /** diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandProtectionRangeChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandProtectionRangeChangeEvent.java index d033f5fa5..d38d21a3b 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandProtectionRangeChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandProtectionRangeChangeEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandRankChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandRankChangeEvent.java index e27f1b0ca..67167f03f 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandRankChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandRankChangeEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandRegisteredEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandRegisteredEvent.java index c8b77c2a8..c3189fed2 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandRegisteredEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandRegisteredEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandReservedEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandReservedEvent.java index e8dc7738b..3a8fb474c 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandReservedEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandReservedEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnbanEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnbanEvent.java index 94ab59e1e..b02d3339c 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnbanEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnbanEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnlockEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnlockEvent.java index c44437497..95726975e 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnlockEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnlockEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnregisteredEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnregisteredEvent.java index c3304cf9e..d11d9c1fc 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnregisteredEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandUnregisteredEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamDeleteEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamDeleteEvent.java index 863a6591c..0317b7c7a 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamDeleteEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamDeleteEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamGeneralEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamGeneralEvent.java index 1e71493eb..1a3a862bf 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamGeneralEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamGeneralEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamInfoEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamInfoEvent.java index 14dbc8214..0cf632e8b 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamInfoEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamInfoEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamInviteEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamInviteEvent.java index 1a1fca2f2..6bd40dcbe 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamInviteEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamInviteEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinEvent.java index 73940e019..6523a113e 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinedEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinedEvent.java index e750154a0..7164d3c59 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinedEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamJoinedEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamKickEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamKickEvent.java index 00a8a11ff..f3bd18b14 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamKickEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamKickEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamLeaveEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamLeaveEvent.java index 28ca431a0..d4c16a7af 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamLeaveEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamLeaveEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamRejectEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamRejectEvent.java index adcd4359c..218b88746 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamRejectEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamRejectEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamSetownerEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamSetownerEvent.java index 2d0b81892..e907cf91a 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamSetownerEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamSetownerEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamUninviteEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamUninviteEvent.java index 60953cd8e..2a07712bb 100644 --- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamUninviteEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamUninviteEvent.java @@ -4,8 +4,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.HandlerList; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.events.IslandBaseEvent; import world.bentobox.bentobox.database.objects.Island; diff --git a/src/main/java/world/bentobox/bentobox/api/panels/TemplatedPanel.java b/src/main/java/world/bentobox/bentobox/api/panels/TemplatedPanel.java index 4f4afdbfa..c3429f717 100644 --- a/src/main/java/world/bentobox/bentobox/api/panels/TemplatedPanel.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/TemplatedPanel.java @@ -7,10 +7,13 @@ package world.bentobox.bentobox.api.panels; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiFunction; + import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import java.util.*; -import java.util.function.BiFunction; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; diff --git a/src/main/java/world/bentobox/bentobox/api/panels/builders/TemplatedPanelBuilder.java b/src/main/java/world/bentobox/bentobox/api/panels/builders/TemplatedPanelBuilder.java index fa8ea51e3..851829df3 100644 --- a/src/main/java/world/bentobox/bentobox/api/panels/builders/TemplatedPanelBuilder.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/builders/TemplatedPanelBuilder.java @@ -7,12 +7,13 @@ package world.bentobox.bentobox.api.panels.builders; -import org.bukkit.World; import java.io.File; import java.util.HashMap; import java.util.Map; import java.util.function.BiFunction; +import org.bukkit.World; + import world.bentobox.bentobox.api.panels.PanelItem; import world.bentobox.bentobox.api.panels.PanelListener; import world.bentobox.bentobox.api.panels.TemplatedPanel; diff --git a/src/main/java/world/bentobox/bentobox/api/panels/reader/ItemTemplateRecord.java b/src/main/java/world/bentobox/bentobox/api/panels/reader/ItemTemplateRecord.java index fe8e39974..9c4cce534 100644 --- a/src/main/java/world/bentobox/bentobox/api/panels/reader/ItemTemplateRecord.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/reader/ItemTemplateRecord.java @@ -7,15 +7,16 @@ package world.bentobox.bentobox.api.panels.reader; -import org.bukkit.event.inventory.ClickType; -import org.bukkit.inventory.ItemStack; -import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.bukkit.event.inventory.ClickType; +import org.bukkit.inventory.ItemStack; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; + /** * This Record contains all necessary information about Item Template that can be used to craft panel item. @@ -30,11 +31,11 @@ import java.util.Map; * @since 1.17.3 */ public record ItemTemplateRecord(@Nullable ItemStack icon, - @Nullable String title, - @Nullable String description, - @NonNull List actions, - @NonNull Map dataMap, - @Nullable ItemTemplateRecord fallback) + @Nullable String title, + @Nullable String description, + @NonNull List actions, + @NonNull Map dataMap, + @Nullable ItemTemplateRecord fallback) { /** * Instantiates a new Item template record without actions and data map. diff --git a/src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java b/src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java index 7721746b0..f913b207b 100644 --- a/src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java @@ -7,7 +7,11 @@ package world.bentobox.bentobox.api.panels.reader; -import com.google.common.base.Enums; +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.InvalidConfigurationException; @@ -15,10 +19,8 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.event.inventory.ClickType; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; + +import com.google.common.base.Enums; import world.bentobox.bentobox.api.panels.Panel; import world.bentobox.bentobox.util.ItemParser; diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/AddonPlaceholderExpansion.java b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/AddonPlaceholderExpansion.java index 83115c750..1aa5b12e8 100644 --- a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/AddonPlaceholderExpansion.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/AddonPlaceholderExpansion.java @@ -1,6 +1,7 @@ package world.bentobox.bentobox.api.placeholders.placeholderapi; import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.addons.Addon; public class AddonPlaceholderExpansion extends BasicPlaceholderExpansion { diff --git a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BentoBoxPlaceholderExpansion.java b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BentoBoxPlaceholderExpansion.java index c00e98384..fe2ec60e8 100644 --- a/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BentoBoxPlaceholderExpansion.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BentoBoxPlaceholderExpansion.java @@ -1,6 +1,7 @@ package world.bentobox.bentobox.api.placeholders.placeholderapi; import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.BentoBox; public class BentoBoxPlaceholderExpansion extends BasicPlaceholderExpansion { diff --git a/src/main/java/world/bentobox/bentobox/api/user/Notifier.java b/src/main/java/world/bentobox/bentobox/api/user/Notifier.java index b78888cd8..84fb8822e 100644 --- a/src/main/java/world/bentobox/bentobox/api/user/Notifier.java +++ b/src/main/java/world/bentobox/bentobox/api/user/Notifier.java @@ -3,10 +3,11 @@ package world.bentobox.bentobox.api.user; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import org.eclipse.jdt.annotation.NonNull; + import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import org.eclipse.jdt.annotation.NonNull; /** * Utilities class that helps to avoid spamming the User with potential repeated messages diff --git a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionPrompt.java b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionPrompt.java index 661b6000d..2b28618c2 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionPrompt.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionPrompt.java @@ -7,8 +7,8 @@ import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.Prompt; import org.bukkit.conversations.StringPrompt; import org.bukkit.entity.Player; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java index e5e78341e..279c38ab3 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/conversation/DescriptionSuccessPrompt.java @@ -6,8 +6,8 @@ import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.MessagePrompt; import org.bukkit.conversations.Prompt; import org.bukkit.entity.Player; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameConversationPrefix.java b/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameConversationPrefix.java index 0da78ac24..aee43be76 100644 --- a/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameConversationPrefix.java +++ b/src/main/java/world/bentobox/bentobox/blueprints/conversation/NameConversationPrefix.java @@ -3,8 +3,8 @@ package world.bentobox.bentobox.blueprints.conversation; import org.bukkit.conversations.ConversationContext; import org.bukkit.conversations.ConversationPrefix; import org.bukkit.entity.Player; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.user.User; public class NameConversationPrefix implements ConversationPrefix { diff --git a/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java b/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java index 405e9aa28..b9582485e 100644 --- a/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java +++ b/src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java @@ -17,7 +17,15 @@ import com.google.gson.reflect.TypeToken; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.flags.Flag; -import world.bentobox.bentobox.database.json.adapters.*; +import world.bentobox.bentobox.database.json.adapters.BiomeTypeAdapter; +import world.bentobox.bentobox.database.json.adapters.BukkitObjectTypeAdapter; +import world.bentobox.bentobox.database.json.adapters.EnumTypeAdapter; +import world.bentobox.bentobox.database.json.adapters.FlagTypeAdapter; +import world.bentobox.bentobox.database.json.adapters.ItemStackTypeAdapter; +import world.bentobox.bentobox.database.json.adapters.LocationTypeAdapter; +import world.bentobox.bentobox.database.json.adapters.PotionEffectTypeAdapter; +import world.bentobox.bentobox.database.json.adapters.VectorTypeAdapter; +import world.bentobox.bentobox.database.json.adapters.WorldTypeAdapter; import world.bentobox.bentobox.versions.ServerCompatibility; diff --git a/src/main/java/world/bentobox/bentobox/database/json/adapters/BiomeTypeAdapter.java b/src/main/java/world/bentobox/bentobox/database/json/adapters/BiomeTypeAdapter.java index 93140863f..f69bee029 100644 --- a/src/main/java/world/bentobox/bentobox/database/json/adapters/BiomeTypeAdapter.java +++ b/src/main/java/world/bentobox/bentobox/database/json/adapters/BiomeTypeAdapter.java @@ -6,15 +6,6 @@ package world.bentobox.bentobox.database.json.adapters; - -import com.google.common.base.Enums; -import com.google.gson.TypeAdapter; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonToken; -import com.google.gson.stream.JsonWriter; -import org.bukkit.block.Biome; -import org.eclipse.jdt.annotation.Nullable; - import java.io.IOException; import java.util.Arrays; import java.util.Collections; @@ -22,6 +13,15 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import org.bukkit.block.Biome; +import org.eclipse.jdt.annotation.Nullable; + +import com.google.common.base.Enums; +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; +import com.google.gson.stream.JsonWriter; + /** * Minecraft 1.18 reworked their biomes, and a lot of things were renamed or removed. diff --git a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java index f9efcb15c..d13436fc1 100644 --- a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java @@ -7,6 +7,7 @@ import java.util.concurrent.CompletableFuture; import org.bson.Document; import org.bson.conversions.Bson; import org.bukkit.Bukkit; +import org.eclipse.jdt.annotation.NonNull; import com.google.gson.Gson; import com.mongodb.MongoClientException; @@ -19,7 +20,6 @@ import com.mongodb.client.model.IndexOptions; import com.mongodb.client.model.Indexes; import com.mongodb.util.JSON; -import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.database.DatabaseConnector; import world.bentobox.bentobox.database.json.AbstractJSONDatabaseHandler; diff --git a/src/main/java/world/bentobox/bentobox/hooks/LangUtilsHook.java b/src/main/java/world/bentobox/bentobox/hooks/LangUtilsHook.java index 01c584594..b58864e2f 100644 --- a/src/main/java/world/bentobox/bentobox/hooks/LangUtilsHook.java +++ b/src/main/java/world/bentobox/bentobox/hooks/LangUtilsHook.java @@ -1,6 +1,9 @@ package world.bentobox.bentobox.hooks; -import com.meowj.langutils.lang.LanguageHelper; +import java.util.Locale; +import java.util.Map.Entry; +import java.util.logging.Logger; + import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.block.Biome; @@ -18,15 +21,14 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionType; import org.jetbrains.annotations.Nullable; + +import com.meowj.langutils.lang.LanguageHelper; + import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.hooks.Hook; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; -import java.util.Locale; -import java.util.Map.Entry; -import java.util.logging.Logger; - /** * @author ApacheZy * @since 1.6.0 diff --git a/src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java b/src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java index f16766a37..f33f8f06d 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java @@ -395,6 +395,10 @@ public class PortalTeleportationListener implements Listener { if (fromWorld.getEnvironment() != env) { World toWorld = Objects.requireNonNull(getNetherEndWorld(overWorld, env)); Location spawnPoint = toWorld.getSpawnLocation(); + // If going to the nether and nether portals are active then just teleport to approx location + if (env.equals(Environment.NETHER) && plugin.getIWM().getWorldSettings(overWorld).isMakeNetherPortals()) { + spawnPoint = e.getFrom().toVector().toLocation(toWorld); + } // If spawn is set as 0,63,0 in the End then move it to 100, 50 ,0. if (env.equals(Environment.THE_END) && spawnPoint.getBlockX() == 0 && spawnPoint.getBlockZ() == 0) { // Set to the default end spawn diff --git a/src/main/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListener.java b/src/main/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListener.java index 737a219a2..689f9520c 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListener.java @@ -109,6 +109,10 @@ public class StandardSpawnProtectionListener implements Listener { * @return true if in the spawn area, false if not */ private boolean atSpawn(@NonNull Location location) { + if (plugin.getIWM().getWorldSettings(location.getWorld()).isMakeNetherPortals()) { + // If nether portals are active, there is no common spawn + return false; + } Vector p = location.toVector().multiply(new Vector(1, 0, 1)); Vector spawn = location.getWorld().getSpawnLocation().toVector().multiply(new Vector(1, 0, 1)); int radius = plugin.getIWM().getNetherSpawnRadius(location.getWorld()); @@ -118,6 +122,7 @@ public class StandardSpawnProtectionListener implements Listener { /** * If the player is not in the standard nether or standard end or op, do nothing. + * If portal making is true, then do not protect spawn. * Used to protect the standard spawn for nether or end. * * @param player - the player @@ -127,6 +132,8 @@ public class StandardSpawnProtectionListener implements Listener { return (player.isOp() || player.getWorld().getEnvironment().equals(World.Environment.NORMAL) || !plugin.getIWM().inWorld(Util.getWorld(player.getWorld())) || (player.getWorld().getEnvironment().equals(World.Environment.NETHER) && plugin.getIWM().isNetherIslands(player.getWorld())) + || (player.getWorld().getEnvironment().equals(World.Environment.NETHER) && plugin.getIWM().getWorldSettings(player.getWorld()).isMakeNetherPortals()) || (player.getWorld().getEnvironment().equals(World.Environment.THE_END) && plugin.getIWM().isEndIslands(player.getWorld()))); + } } diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java index b4d3179a8..3717c6c04 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java @@ -13,7 +13,6 @@ import org.bukkit.event.inventory.ClickType; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; - import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.panels.Panel; diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java index 07322a213..8b75317d2 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java @@ -48,8 +48,8 @@ public class FireListener extends FlagListener { * @param e - event */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) - public boolean onBlockBurn(BlockBurnEvent e) { - return checkFire(e, e.getBlock().getLocation(), Flags.FIRE_BURNING); + public void onBlockBurn(BlockBurnEvent e) { + checkFire(e, e.getBlock().getLocation(), Flags.FIRE_BURNING); } /** @@ -57,8 +57,10 @@ public class FireListener extends FlagListener { * @param e - event */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) - public boolean onBlockSpread(BlockSpreadEvent e) { - return e.getSource().getType().equals(Material.FIRE) && checkFire(e, e.getBlock().getLocation(), Flags.FIRE_SPREAD); + public void onBlockSpread(BlockSpreadEvent e) { + if (e.getSource().getType().equals(Material.FIRE)) { + checkFire(e, e.getBlock().getLocation(), Flags.FIRE_SPREAD); + } } /** @@ -66,9 +68,11 @@ public class FireListener extends FlagListener { * @param e - event */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) - public boolean onBlockIgnite(BlockIgniteEvent e) { + public void onBlockIgnite(BlockIgniteEvent e) { // Check if this is a portal lighting - that is allowed any time - return !e.getBlock().getType().equals(Material.OBSIDIAN) && checkFire(e, e.getBlock().getLocation(), Flags.FIRE_IGNITE); + if (!e.getBlock().getType().equals(Material.OBSIDIAN)) { + checkFire(e, e.getBlock().getLocation(), Flags.FIRE_IGNITE); + } } /** @@ -95,7 +99,7 @@ public class FireListener extends FlagListener { } } - @EventHandler + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onLightningStrikeEvent(LightningStrikeEvent e) { checkFire(e, e.getLightning().getLocation(), Flags.FIRE_IGNITE); } diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java index 9f8ec51c1..95fa41058 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java @@ -43,10 +43,10 @@ public class TNTListener extends FlagListener { * @param e - event */ @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) - public boolean onTNTDamage(EntityChangeBlockEvent e) { + public void onTNTDamage(EntityChangeBlockEvent e) { // Check world if (!e.getBlock().getType().equals(Material.TNT) || !getIWM().inWorld(e.getBlock().getLocation())) { - return false; + return; } // Stop TNT from being damaged if it is being caused by a visitor with a flaming arrow if (e.getEntity() instanceof Projectile projectile) { @@ -56,10 +56,8 @@ public class TNTListener extends FlagListener { // Remove the arrow projectile.remove(); e.setCancelled(true); - return true; } } - return false; } /** diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java index 8ae046632..3c0cdf5c3 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java @@ -21,6 +21,15 @@ import world.bentobox.bentobox.util.Util; */ public class MobSpawnListener extends FlagListener { + /** + * Prevents mobs spawning naturally + * + * @param e - event + */ + @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) + public void onMobSpawnEvent(CreatureSpawnEvent e) { + onMobSpawn(e); + } /** * Prevents mobs spawning naturally * @@ -28,7 +37,7 @@ public class MobSpawnListener extends FlagListener { * @return true if cancelled */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) - public boolean onMobSpawn(CreatureSpawnEvent e) { + boolean onMobSpawn(CreatureSpawnEvent e) { // If not in the right world, or spawning is not natural return if (!getIWM().inWorld(e.getEntity().getLocation())) { return false; diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java index b312edab4..df67b0a5c 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java @@ -33,10 +33,18 @@ public class ObsidianScoopingListener extends FlagListener { * Enables changing of obsidian back into lava * * @param e event - * @return false if obsidian not scooped, true if scooped */ @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) - public boolean onPlayerInteract(final PlayerInteractEvent e) { + public void onPlayerInteractEvent(final PlayerInteractEvent e) { + onPlayerInteract(e); + } + /** + * Enables changing of obsidian back into lava + * + * @param e event + * @return false if obsidian not scooped, true if scooped + */ + boolean onPlayerInteract(final PlayerInteractEvent e) { if (!getIWM().inWorld(e.getPlayer().getLocation()) || !Flags.OBSIDIAN_SCOOPING.isSetForWorld(e.getPlayer().getWorld()) || !e.getPlayer().getGameMode().equals(GameMode.SURVIVAL) diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListener.java index 6673895ce..3bae913f8 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListener.java @@ -1,17 +1,18 @@ package world.bentobox.bentobox.listeners.flags.worldsettings; +import java.util.Optional; + import org.bukkit.World; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.PlayerDeathEvent; + 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; import world.bentobox.bentobox.util.Util; -import java.util.Optional; - /** * Prevents visitors from losing their items if they * die on an island in which they are a visitor. diff --git a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java index 707a9051e..0026d94c3 100644 --- a/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java @@ -1,6 +1,10 @@ package world.bentobox.bentobox.managers; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandChunkDeletionManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandChunkDeletionManager.java index d7d00035c..7316cd48d 100644 --- a/src/main/java/world/bentobox/bentobox/managers/IslandChunkDeletionManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/IslandChunkDeletionManager.java @@ -1,13 +1,13 @@ package world.bentobox.bentobox.managers; -import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.database.objects.IslandDeletion; -import world.bentobox.bentobox.util.DeleteIslandChunks; - import java.util.LinkedList; import java.util.Queue; import java.util.concurrent.atomic.AtomicReference; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.database.objects.IslandDeletion; +import world.bentobox.bentobox.util.DeleteIslandChunks; + /** * Manages the queue of island chunks to be deleted. */ diff --git a/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java b/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java index b41f651b6..5917a93f6 100644 --- a/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java +++ b/src/main/java/world/bentobox/bentobox/panels/settings/WorldDefaultSettingsTab.java @@ -6,8 +6,8 @@ import java.util.stream.Collectors; import org.bukkit.Material; import org.bukkit.World; - import org.eclipse.jdt.annotation.NonNull; + import world.bentobox.bentobox.api.flags.Flag.Type; import world.bentobox.bentobox.api.flags.clicklisteners.WorldToggleClick; import world.bentobox.bentobox.api.localization.TextVariables; diff --git a/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java b/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java index fb61eec57..0f1c88602 100644 --- a/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java +++ b/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java @@ -1,6 +1,12 @@ package world.bentobox.bentobox.util; -import io.papermc.lib.PaperLib; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicBoolean; + import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; @@ -10,6 +16,8 @@ import org.bukkit.generator.ChunkGenerator; import org.bukkit.generator.ChunkGenerator.ChunkData; import org.bukkit.inventory.InventoryHolder; import org.bukkit.scheduler.BukkitTask; + +import io.papermc.lib.PaperLib; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.events.island.IslandEvent; @@ -17,13 +25,6 @@ import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; import world.bentobox.bentobox.database.objects.IslandDeletion; import world.bentobox.bentobox.nms.NMSAbstraction; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicBoolean; - /** * Deletes islands chunk by chunk * diff --git a/src/main/java/world/bentobox/bentobox/util/ItemParser.java b/src/main/java/world/bentobox/bentobox/util/ItemParser.java index feb21ae42..7508312c4 100644 --- a/src/main/java/world/bentobox/bentobox/util/ItemParser.java +++ b/src/main/java/world/bentobox/bentobox/util/ItemParser.java @@ -1,21 +1,26 @@ package world.bentobox.bentobox.util; -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.properties.Property; +import java.lang.reflect.Field; +import java.util.MissingFormatArgumentException; +import java.util.UUID; + import org.bukkit.Bukkit; import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.block.banner.Pattern; import org.bukkit.block.banner.PatternType; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.*; +import org.bukkit.inventory.meta.BannerMeta; +import org.bukkit.inventory.meta.Damageable; +import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.inventory.meta.PotionMeta; +import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionType; import org.eclipse.jdt.annotation.Nullable; -import java.lang.reflect.Field; -import java.util.MissingFormatArgumentException; -import java.util.UUID; +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.properties.Property; import world.bentobox.bentobox.BentoBox; diff --git a/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java b/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java index 093128f06..a413010e5 100644 --- a/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java +++ b/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java @@ -1,19 +1,5 @@ package world.bentobox.bentobox.util.teleport; -import org.bukkit.*; -import org.bukkit.World.Environment; -import org.bukkit.block.BlockFace; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitTask; -import org.bukkit.util.Vector; -import org.eclipse.jdt.annotation.Nullable; -import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.util.Pair; -import world.bentobox.bentobox.util.Util; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -21,6 +7,26 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; +import org.bukkit.Bukkit; +import org.bukkit.Chunk; +import org.bukkit.ChunkSnapshot; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.World.Environment; +import org.bukkit.block.BlockFace; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.scheduler.BukkitTask; +import org.bukkit.util.Vector; +import org.eclipse.jdt.annotation.Nullable; + +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Pair; +import world.bentobox.bentobox.util.Util; + /** * A class that calculates finds a safe spot asynchronously and then teleports the player there. * diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommandTest.java index 46210a565..9aa60dcfe 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminSwitchCommandTest.java @@ -1,9 +1,12 @@ package world.bentobox.bentobox.api.commands.admin; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.mockito.Mockito.*; import java.util.Collections; import java.util.HashMap; diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommandTest.java index c0b16321b..c15064a1b 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommandTest.java @@ -1,6 +1,8 @@ package world.bentobox.bentobox.api.commands.island.team; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; diff --git a/src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java index d46c61259..4b8f1b221 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/PortalTeleportationListenerTest.java @@ -110,6 +110,7 @@ public class PortalTeleportationListenerTest { when(iwm.inWorld(any(World.class))).thenReturn(true); when(iwm.inWorld(any(Location.class))).thenReturn(true); when(iwm.getNetherSpawnRadius(any())).thenReturn(100); + when(iwm.getWorldSettings(any())).thenReturn(ws); when(plugin.getIWM()).thenReturn(iwm); PowerMockito.mockStatic(Util.class, Mockito.RETURNS_MOCKS); @@ -186,6 +187,9 @@ public class PortalTeleportationListenerTest { // Player when(player.getType()).thenReturn(EntityType.PLAYER); + // Bukkit + when(Bukkit.getAllowNether()).thenReturn(true); + when(Bukkit.getAllowEnd()).thenReturn(true); } @After @@ -465,6 +469,29 @@ public class PortalTeleportationListenerTest { assertTrue(np.onIslandPortal(e)); // Verify assertFalse(e.isCancelled()); + // We are not going to 1,2,3 + assertFalse(e.getTo().toString().contains("x=1.0,y=2.0,z=3.0")); + } + + /** + * Test method for {@link PortalTeleportationListener#onIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}. + */ + @Test + public void testonIslandPortalFromWorldToNetherStandardMakePortals() { + when(ws.isMakeNetherPortals()).thenReturn(true); + PortalTeleportationListener np = new PortalTeleportationListener(plugin); + Location from = mock(Location.class); + // Teleport from world to nether + when(from.getWorld()).thenReturn(world); + when(from.toVector()).thenReturn(new Vector(1,2,3)); + PlayerPortalEvent e = new PlayerPortalEvent(player, from, null, TeleportCause.NETHER_PORTAL); + // Nether islands inactive + when(iwm.isNetherIslands(any())).thenReturn(false); + when(iwm.isNetherGenerate(any())).thenReturn(true); + assertTrue(np.onIslandPortal(e)); + // Verify + assertFalse(e.isCancelled()); + assertTrue(e.getTo().toString().contains("x=1.0,y=2.0,z=3.0")); } /** diff --git a/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java index daec95f7e..a1313c89a 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/StandardSpawnProtectionListenerTest.java @@ -40,6 +40,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.managers.IslandWorldManager; import world.bentobox.bentobox.managers.IslandsManager; @@ -82,6 +83,8 @@ public class StandardSpawnProtectionListenerTest { private BlockState blockState; @Mock private Location spawnLocation; + @Mock + private WorldSettings ws; /** * @throws java.lang.Exception @@ -105,6 +108,7 @@ public class StandardSpawnProtectionListenerTest { when(iwm.isEndIslands(any())).thenReturn(false); when(iwm.inWorld(any(World.class))).thenReturn(true); when(iwm.getNetherSpawnRadius(any())).thenReturn(25); + when(iwm.getWorldSettings(any())).thenReturn(ws); // Util PowerMockito.mockStatic(Util.class); when(Util.getWorld(any())).thenReturn(world); @@ -157,6 +161,18 @@ public class StandardSpawnProtectionListenerTest { verify(player).sendMessage("protection.spawn-protected"); } + /** + * Test method for {@link world.bentobox.bentobox.listeners.StandardSpawnProtectionListener#onBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}. + */ + @Test + public void testOnBlockPlaceDisallowedNoProtection() { + when(iwm.isNetherIslands(any())).thenReturn(true); + BlockPlaceEvent e = new BlockPlaceEvent(block, blockState, null, null, player, true, EquipmentSlot.HAND); + ssp.onBlockPlace(e); + assertFalse(e.isCancelled()); + verify(player, never()).sendMessage("protection.spawn-protected"); + } + /** * Test method for {@link world.bentobox.bentobox.listeners.StandardSpawnProtectionListener#onBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}. */ @@ -232,6 +248,18 @@ public class StandardSpawnProtectionListenerTest { verify(player).sendMessage("protection.spawn-protected"); } + /** + * Test method for {@link world.bentobox.bentobox.listeners.StandardSpawnProtectionListener#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}. + */ + @Test + public void testOnBlockBreakDisallowedNoProtection() { + when(ws.isMakeNetherPortals()).thenReturn(true); + BlockBreakEvent e = new BlockBreakEvent(block, player); + ssp.onBlockBreak(e); + assertFalse(e.isCancelled()); + verify(player, never()).sendMessage("protection.spawn-protected"); + } + /** * Test method for {@link world.bentobox.bentobox.listeners.StandardSpawnProtectionListener#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}. */ @@ -267,6 +295,32 @@ public class StandardSpawnProtectionListenerTest { assertEquals(1, blockList.size()); } + + /** + * Test method for {@link world.bentobox.bentobox.listeners.StandardSpawnProtectionListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. + */ + @Test + public void testOnExplosionNoProtection() { + when(ws.isMakeNetherPortals()).thenReturn(true); + List blockList = new ArrayList<>(); + blockList.add(block); + blockList.add(block); + blockList.add(block); + blockList.add(block); + blockList.add(block); + // Make some inside and outside spawn + when(location.toVector()).thenReturn(new Vector(0,0,0), + new Vector(0,0,0), + new Vector(0,0,0), + new Vector(0,0,0), + new Vector(10000,0,0)); + EntityExplodeEvent e = new EntityExplodeEvent(player, location, blockList, 0); + ssp.onExplosion(e); + // No blocks should be removed + assertEquals(5, blockList.size()); + } + + /** * Test method for {@link world.bentobox.bentobox.listeners.StandardSpawnProtectionListener#onBucketEmpty(org.bukkit.event.player.PlayerBucketEmptyEvent)}. */ @@ -278,6 +332,18 @@ public class StandardSpawnProtectionListenerTest { verify(player).sendMessage("protection.spawn-protected"); } + /** + * Test method for {@link world.bentobox.bentobox.listeners.StandardSpawnProtectionListener#onBucketEmpty(org.bukkit.event.player.PlayerBucketEmptyEvent)}. + */ + @Test + public void testOnBucketEmptyDisallowedNoProtection() { + when(ws.isMakeNetherPortals()).thenReturn(true); + PlayerBucketEmptyEvent e = new PlayerBucketEmptyEvent(player, block, block, BlockFace.DOWN, null, null); + ssp.onBucketEmpty(e); + assertFalse(e.isCancelled()); + verify(player, never()).sendMessage("protection.spawn-protected"); + } + /** * Test method for {@link world.bentobox.bentobox.listeners.StandardSpawnProtectionListener#onBucketEmpty(org.bukkit.event.player.PlayerBucketEmptyEvent)}. */ diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java index f43634ea8..75a12c3eb 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/FireListenerTest.java @@ -128,12 +128,12 @@ public class FireListenerTest { // Player name PlayersManager pm = mock(PlayersManager.class); - when(pm.getName(Mockito.any())).thenReturn("tastybento"); + when(pm.getName(any())).thenReturn("tastybento"); when(plugin.getPlayers()).thenReturn(pm); // World Settings WorldSettings ws = mock(WorldSettings.class); - when(iwm.getWorldSettings(Mockito.any())).thenReturn(ws); + when(iwm.getWorldSettings(any())).thenReturn(ws); when(ws.getWorldFlags()).thenReturn(worldFlags); GameModeAddon gma = mock(GameModeAddon.class); @@ -141,7 +141,7 @@ public class FireListenerTest { when(iwm.getAddon(any())).thenReturn(opGma); PowerMockito.mockStatic(Util.class); - when(Util.getWorld(Mockito.any())).thenReturn(mock(World.class)); + when(Util.getWorld(any())).thenReturn(mock(World.class)); } @After @@ -168,16 +168,16 @@ public class FireListenerTest { listener.setPlugin(plugin); // Disallow fire - when(island.isAllowed(Mockito.any())).thenReturn(false); - when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false); + when(island.isAllowed(any())).thenReturn(false); + when(island.isAllowed(any(), any())).thenReturn(false); Flags.FLINT_AND_STEEL.setDefaultSetting(false); assertTrue(listener.checkFire(e, location, Flags.FLINT_AND_STEEL)); Flags.FLINT_AND_STEEL.setDefaultSetting(true); assertTrue(listener.checkFire(e, location, Flags.FLINT_AND_STEEL)); // Allow fire - when(island.isAllowed(Mockito.any())).thenReturn(true); - when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(true); + when(island.isAllowed(any())).thenReturn(true); + when(island.isAllowed(any(), any())).thenReturn(true); Flags.FLINT_AND_STEEL.setDefaultSetting(false); assertFalse(listener.checkFire(e, location, Flags.FLINT_AND_STEEL)); Flags.FLINT_AND_STEEL.setDefaultSetting(true); @@ -211,20 +211,24 @@ public class FireListenerTest { listener.setPlugin(plugin); // Disallow fire - when(island.isAllowed(Mockito.any())).thenReturn(false); - when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false); + when(island.isAllowed(any())).thenReturn(false); + when(island.isAllowed(any(), any())).thenReturn(false); Flags.FIRE_BURNING.setDefaultSetting(false); - assertTrue(listener.onBlockBurn(e)); + listener.onBlockBurn(e); + assertTrue(e.isCancelled()); Flags.FIRE_BURNING.setDefaultSetting(true); - assertTrue(listener.onBlockBurn(e)); + listener.onBlockBurn(e); + assertTrue(e.isCancelled()); // Allow fire - when(island.isAllowed(Mockito.any())).thenReturn(true); - when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(true); + when(island.isAllowed(any())).thenReturn(true); + when(island.isAllowed(any(), any())).thenReturn(true); Flags.FIRE_BURNING.setDefaultSetting(false); - assertFalse(listener.onBlockBurn(e)); + listener.onBlockBurn(e); + assertFalse(e.isCancelled()); Flags.FIRE_BURNING.setDefaultSetting(true); - assertFalse(listener.onBlockBurn(e)); + listener.onBlockBurn(e); + assertFalse(e.isCancelled()); // Check with no island e = new BlockBurnEvent(block, block); @@ -235,7 +239,8 @@ public class FireListenerTest { assertTrue(e.isCancelled()); // Fire allowed Flags.FIRE_BURNING.setDefaultSetting(true); - assertFalse(listener.onBlockBurn(e)); + listener.onBlockBurn(e); + assertFalse(e.isCancelled()); } @Test @@ -261,29 +266,35 @@ public class FireListenerTest { listener.setPlugin(plugin); // Disallow fire - when(island.isAllowed(Mockito.any())).thenReturn(false); - when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false); + when(island.isAllowed(any())).thenReturn(false); + when(island.isAllowed(any(), any())).thenReturn(false); Flags.FIRE_SPREAD.setDefaultSetting(false); - assertTrue(listener.onBlockSpread(e)); + listener.onBlockSpread(e); + assertTrue(e.isCancelled()); Flags.FIRE_SPREAD.setDefaultSetting(true); - assertTrue(listener.onBlockSpread(e)); + listener.onBlockSpread(e); + assertTrue(e.isCancelled()); // Allow fire spread - when(island.isAllowed(Mockito.any())).thenReturn(true); - when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(true); + when(island.isAllowed(any())).thenReturn(true); + when(island.isAllowed(any(), any())).thenReturn(true); Flags.FIRE_SPREAD.setDefaultSetting(false); - assertFalse(listener.onBlockSpread(e)); + listener.onBlockSpread(e); + assertFalse(e.isCancelled()); Flags.FIRE_SPREAD.setDefaultSetting(true); - assertFalse(listener.onBlockSpread(e)); + listener.onBlockSpread(e); + assertFalse(e.isCancelled()); // Check with no island when(im.getIslandAt(any())).thenReturn(Optional.empty()); // Fire spread is not allowed, so should be cancelled Flags.FIRE_SPREAD.setDefaultSetting(false); - assertTrue(listener.onBlockSpread(e)); + listener.onBlockSpread(e); + assertTrue(e.isCancelled()); // Fire allowed Flags.FIRE_SPREAD.setDefaultSetting(true); - assertFalse(listener.onBlockSpread(e)); + listener.onBlockSpread(e); + assertFalse(e.isCancelled()); } @Test @@ -307,34 +318,41 @@ public class FireListenerTest { listener.setPlugin(plugin); // Obsidian is okay to ignite - assertFalse(listener.onBlockIgnite(e)); + listener.onBlockIgnite(e); + assertFalse(e.isCancelled()); // Now set to something flammable when(block.getType()).thenReturn(Material.OAK_PLANKS); // Disallow fire - when(island.isAllowed(Mockito.any())).thenReturn(false); - when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(false); + when(island.isAllowed(any())).thenReturn(false); + when(island.isAllowed(any(), any())).thenReturn(false); Flags.FIRE_IGNITE.setDefaultSetting(false); - assertTrue(listener.onBlockIgnite(e)); + listener.onBlockIgnite(e); + assertTrue(e.isCancelled()); Flags.FIRE_IGNITE.setDefaultSetting(true); - assertTrue(listener.onBlockIgnite(e)); + listener.onBlockIgnite(e); + assertTrue(e.isCancelled()); // Allow fire spread - when(island.isAllowed(Mockito.any())).thenReturn(true); - when(island.isAllowed(Mockito.any(), Mockito.any())).thenReturn(true); + when(island.isAllowed(any())).thenReturn(true); + when(island.isAllowed(any(), any())).thenReturn(true); Flags.FIRE_IGNITE.setDefaultSetting(false); - assertFalse(listener.onBlockIgnite(e)); + listener.onBlockIgnite(e); + assertFalse(e.isCancelled()); Flags.FIRE_IGNITE.setDefaultSetting(true); - assertFalse(listener.onBlockIgnite(e)); + listener.onBlockIgnite(e); + assertFalse(e.isCancelled()); // Check with no island when(im.getIslandAt(any())).thenReturn(Optional.empty()); // Fire spread is not allowed, so should be cancelled Flags.FIRE_IGNITE.setDefaultSetting(false); - assertTrue(listener.onBlockIgnite(e)); + listener.onBlockIgnite(e); + assertTrue(e.isCancelled()); // Fire allowed Flags.FIRE_IGNITE.setDefaultSetting(true); - assertFalse(listener.onBlockIgnite(e)); + listener.onBlockIgnite(e); + assertFalse(e.isCancelled()); } } diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java index da27748d7..87c4815c3 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/protection/TNTListenerTest.java @@ -152,7 +152,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(block.getType()).thenReturn(Material.TNT); // Entity is not a projectile EntityChangeBlockEvent e = new EntityChangeBlockEvent(player, block, Material.AIR.createBlockData()); - assertFalse(listener.onTNTDamage(e)); + listener.onTNTDamage(e); assertFalse(e.isCancelled()); } @@ -163,7 +163,7 @@ public class TNTListenerTest extends AbstractCommonSetup { // Out of world when(iwm.inWorld(any(Location.class))).thenReturn(false); EntityChangeBlockEvent e = new EntityChangeBlockEvent(player, block, Material.AIR.createBlockData()); - assertFalse(listener.onTNTDamage(e)); + listener.onTNTDamage(e); assertFalse(e.isCancelled()); } @Test @@ -173,7 +173,7 @@ public class TNTListenerTest extends AbstractCommonSetup { // Out of world when(iwm.inWorld(any(Location.class))).thenReturn(false); EntityChangeBlockEvent e = new EntityChangeBlockEvent(player, block, Material.AIR.createBlockData()); - assertFalse(listener.onTNTDamage(e)); + listener.onTNTDamage(e); assertFalse(e.isCancelled()); } @@ -191,7 +191,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(arrow.getFireTicks()).thenReturn(10); EntityChangeBlockEvent e = new EntityChangeBlockEvent(arrow, block, Material.AIR.createBlockData()); - assertFalse(listener.onTNTDamage(e)); + listener.onTNTDamage(e); assertFalse(e.isCancelled()); verify(arrow, never()).remove(); } @@ -209,7 +209,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(arrow.getFireTicks()).thenReturn(0); EntityChangeBlockEvent e = new EntityChangeBlockEvent(arrow, block, Material.AIR.createBlockData()); - assertFalse(listener.onTNTDamage(e)); + listener.onTNTDamage(e); assertFalse(e.isCancelled()); verify(arrow, never()).remove(); @@ -228,7 +228,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(arrow.getFireTicks()).thenReturn(10); EntityChangeBlockEvent e = new EntityChangeBlockEvent(arrow, block, Material.AIR.createBlockData()); - assertTrue(listener.onTNTDamage(e)); + listener.onTNTDamage(e); assertTrue(e.isCancelled()); verify(arrow).remove(); @@ -249,7 +249,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(island.isAllowed(any(), eq(Flags.TNT_PRIMING))).thenReturn(true); EntityChangeBlockEvent e = new EntityChangeBlockEvent(arrow, block, Material.AIR.createBlockData()); - assertFalse(listener.onTNTDamage(e)); + listener.onTNTDamage(e); assertFalse(e.isCancelled()); verify(arrow, never()).remove(); @@ -270,7 +270,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(arrow.getFireTicks()).thenReturn(10); EntityChangeBlockEvent e = new EntityChangeBlockEvent(arrow, block, Material.AIR.createBlockData()); - assertTrue(listener.onTNTDamage(e)); + listener.onTNTDamage(e); assertTrue(e.isCancelled()); verify(arrow).remove(); @@ -291,7 +291,7 @@ public class TNTListenerTest extends AbstractCommonSetup { when(arrow.getFireTicks()).thenReturn(10); EntityChangeBlockEvent e = new EntityChangeBlockEvent(arrow, block, Material.AIR.createBlockData()); - assertFalse(listener.onTNTDamage(e)); + listener.onTNTDamage(e); assertFalse(e.isCancelled()); verify(arrow, never()).remove(); diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PetTeleportListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PetTeleportListenerTest.java index c67538860..c2e1a3a4e 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PetTeleportListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/PetTeleportListenerTest.java @@ -2,12 +2,11 @@ package world.bentobox.bentobox.listeners.flags.worldsettings; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Optional; -import static org.mockito.Mockito.*; - import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.AnimalTamer; diff --git a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java index e10047fee..c87ce4501 100644 --- a/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/worldsettings/VisitorKeepInventoryListenerTest.java @@ -8,8 +8,8 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Collections;