Skip to content

Commit

Permalink
Fix tests and merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
tastybento committed Jan 1, 2025
1 parent 123c60d commit 2570888
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector;

import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.events.island.IslandProtectionRangeChangeEvent;
import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.api.metadata.MetaDataValue;
Expand Down Expand Up @@ -122,8 +121,6 @@ public void onPlayerRespawn(PlayerRespawnEvent e) {
private boolean isOn(Player player) {
// Check if border is off
User user = User.getInstance(player);
BentoBox.getInstance().logDebug("Border state meta data = "
+ user.getMetaData(BorderShower.BORDER_STATE_META_DATA).map(mtv -> mtv.asBoolean()).orElse(null));
return user.getMetaData(BorderShower.BORDER_STATE_META_DATA).map(MetaDataValue::asBoolean)
.orElse(addon.getSettings().isShowByDefault());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import world.bentobox.bentobox.managers.IslandWorldManager;
import world.bentobox.bentobox.managers.IslandsManager;
import world.bentobox.bentobox.managers.LocalesManager;
import world.bentobox.bentobox.managers.PlayersManager;
import world.bentobox.bentobox.util.Util;
import world.bentobox.border.Border;
import world.bentobox.border.BorderType;
Expand Down Expand Up @@ -82,6 +83,8 @@ public class IslandBorderCommandTest {
private IslandWorldManager iwm;
@Mock
private BorderShower bs;
@Mock
private PlayersManager pm;

/**
* @throws java.lang.Exception
Expand Down Expand Up @@ -138,6 +141,9 @@ public void setUp() throws Exception {
Settings settings = new Settings();
when(addon.getSettings()).thenReturn(settings);

// Players Manager
when(addon.getPlayers()).thenReturn(pm);

ic = new IslandBorderCommand(addon, ac, "");
}

Expand Down

0 comments on commit 2570888

Please sign in to comment.