Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-12-21 16:47:39 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bugs

Browse Source 
Admin tp was not tp'ing to correct world
Dragon Eggs were unprotected.
Changed name of BSB getWorld methods to be more specific so they are not
used accidentally to get the general world.
This commit is contained in:
tastybento 2018-07-07 15:52:47 -07:00
parent 6781beb3ca
commit 13a246df59
26 changed files with 238 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/us/tastybento/bskyblock/BSkyBlock.java
View File

@ -106,7 +106,7 @@ public class BSkyBlock extends JavaPlugin {
// Load schems manager
schemsManager = new SchemsManager(instance);
// Load the default island schems
schemsManager.loadIslands(getIWM().getIslandWorld());
schemsManager.loadIslands(getIWM().getBSBIslandWorld());
// Set up commands
new IslandCommand();

2
src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java
View File

@ -32,7 +32,7 @@ public class AdminCommand extends CompositeCommand {
setOnlyPlayer(false);
setParameters("commands.admin.help.parameters");
setDescription("commands.admin.help.description");
setWorld(getPlugin().getIWM().getIslandWorld());
setWorld(getPlugin().getIWM().getBSBIslandWorld());
new AdminVersionCommand(this);
new AdminReloadCommand(this);
new AdminTeleportCommand(this, "tp");

2
src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java
View File

@ -36,7 +36,7 @@ public class IslandCommand extends CompositeCommand {
// Permission
setPermissionPrefix("bskyblock");
setPermission("island");
setWorld(getPlugin().getIWM().getIslandWorld());
setWorld(getPlugin().getIWM().getBSBIslandWorld());
// Set up subcommands
new IslandAboutCommand(this);
new IslandCreateCommand(this);

8
src/main/java/us/tastybento/bskyblock/commands/admin/AdminTeleportCommand.java
View File

@ -41,11 +41,11 @@ public class AdminTeleportCommand extends CompositeCommand {
return false;
} else {
if (getIslands().hasIsland(getWorld(), targetUUID) || getIslands().inTeam(getWorld(), targetUUID)) {
Location warpSpot = getIslands().getIslandLocation(getWorld(), targetUUID).toVector().toLocation(getPlugin().getIWM().getIslandWorld());
Location warpSpot = getIslands().getIslandLocation(getWorld(), targetUUID).toVector().toLocation(getWorld());
if (getLabel().equals("tpnether")) {
warpSpot = getIslands().getIslandLocation(getWorld(), targetUUID).toVector().toLocation(getPlugin().getIWM().getNetherWorld());
warpSpot = getIslands().getIslandLocation(getWorld(), targetUUID).toVector().toLocation(getPlugin().getIWM().getNetherWorld(getWorld()));
} else if (getLabel().equals("tpend")) {
warpSpot = getIslands().getIslandLocation(getWorld(), targetUUID).toVector().toLocation(getPlugin().getIWM().getEndWorld());
warpSpot = getIslands().getIslandLocation(getWorld(), targetUUID).toVector().toLocation(getPlugin().getIWM().getEndWorld(getWorld()));
}
// Other wise, go to a safe spot
String failureMessage = user.getTranslation("commands.admin.tp.manual", "[location]", warpSpot.getBlockX() + " " + warpSpot.getBlockY() + " "
@ -60,7 +60,7 @@ public class AdminTeleportCommand extends CompositeCommand {
return false;
}
}
@Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
String lastArg = !args.isEmpty() ? args.get(args.size()-1) : "";

37
src/main/java/us/tastybento/bskyblock/listeners/flags/BlockInteractionListener.java
View File

@ -121,10 +121,47 @@ public class BlockInteractionListener extends AbstractFlagListener {
case REDSTONE_COMPARATOR_OFF:
case DAYLIGHT_DETECTOR:
case DAYLIGHT_DETECTOR_INVERTED:
case REDSTONE_COMPARATOR:
checkIsland(e, e.getClickedBlock().getLocation(), Flags.REDSTONE);
break;
case ARMOR_STAND:
this.getPlugin().log("DEBUG: " + e.getClickedBlock().getType());
break;
case BANNER:
this.getPlugin().log("DEBUG: " + e.getClickedBlock().getType());
break;
case BED:
this.getPlugin().log("DEBUG: " + e.getClickedBlock().getType());
break;
case BOAT:
case BOAT_ACACIA:
case BOAT_BIRCH:
case BOAT_DARK_OAK:
case BOAT_JUNGLE:
case BOAT_SPRUCE:
this.getPlugin().log("DEBUG: " + e.getClickedBlock().getType());
break;
case DRAGON_EGG:
checkIsland(e, e.getClickedBlock().getLocation(), Flags.BREAK_BLOCKS);
break;
case ENDER_PORTAL_FRAME:
this.getPlugin().log("DEBUG: " + e.getClickedBlock().getType());
break;
case FLOWER_POT:
this.getPlugin().log("DEBUG: " + e.getClickedBlock().getType());
break;
case MOB_SPAWNER:
this.getPlugin().log("DEBUG: " + e.getClickedBlock().getType());
break;
case OBSERVER:
this.getPlugin().log("DEBUG: " + e.getClickedBlock().getType());
break;
case POWERED_MINECART:
this.getPlugin().log("DEBUG: " + e.getClickedBlock().getType());
break;
default:
break;
}
// Now check for in-hand items
if (e.getItem() != null) {

212
src/main/java/us/tastybento/bskyblock/managers/IslandWorldManager.java
View File

@ -28,6 +28,7 @@ import us.tastybento.bskyblock.util.Util;
/**
* Handles registration and management of worlds
*
* @author tastybento
*
*/
@ -79,8 +80,8 @@ public class IslandWorldManager {
plugin.log(CREATING + plugin.getName() + "'s Island World...");
}
// Create the world if it does not exist
islandWorld = WorldCreator.name(plugin.getSettings().getWorldName()).type(WorldType.FLAT).environment(World.Environment.NORMAL).generator(new ChunkGeneratorWorld(plugin))
.createWorld();
islandWorld = WorldCreator.name(plugin.getSettings().getWorldName()).type(WorldType.FLAT)
.environment(World.Environment.NORMAL).generator(new ChunkGeneratorWorld(plugin)).createWorld();
addWorld(islandWorld, plugin.getSettings());
// Make the nether if it does not exist
if (plugin.getSettings().isNetherGenerate()) {
@ -88,10 +89,11 @@ public class IslandWorldManager {
plugin.log(CREATING + plugin.getName() + "'s Nether...");
}
if (!plugin.getSettings().isNetherIslands()) {
netherWorld = WorldCreator.name(plugin.getSettings().getWorldName() + NETHER).type(WorldType.NORMAL).environment(World.Environment.NETHER).createWorld();
} else {
netherWorld = WorldCreator.name(plugin.getSettings().getWorldName() + NETHER).type(WorldType.FLAT).generator(new ChunkGeneratorWorld(plugin))
netherWorld = WorldCreator.name(plugin.getSettings().getWorldName() + NETHER).type(WorldType.NORMAL)
.environment(World.Environment.NETHER).createWorld();
} else {
netherWorld = WorldCreator.name(plugin.getSettings().getWorldName() + NETHER).type(WorldType.FLAT)
.generator(new ChunkGeneratorWorld(plugin)).environment(World.Environment.NETHER).createWorld();
}
}
// Make the end if it does not exist
@ -100,22 +102,27 @@ public class IslandWorldManager {
plugin.log(CREATING + plugin.getName() + "'s End World...");
}
if (!plugin.getSettings().isEndIslands()) {
endWorld = WorldCreator.name(plugin.getSettings().getWorldName() + THE_END).type(WorldType.NORMAL).environment(World.Environment.THE_END).createWorld();
} else {
endWorld = WorldCreator.name(plugin.getSettings().getWorldName() + THE_END).type(WorldType.FLAT).generator(new ChunkGeneratorWorld(plugin))
endWorld = WorldCreator.name(plugin.getSettings().getWorldName() + THE_END).type(WorldType.NORMAL)
.environment(World.Environment.THE_END).createWorld();
} else {
endWorld = WorldCreator.name(plugin.getSettings().getWorldName() + THE_END).type(WorldType.FLAT)
.generator(new ChunkGeneratorWorld(plugin)).environment(World.Environment.THE_END)
.createWorld();
}
}
}
/**
* Registers a world with Multiverse if the plugin exists
* @param world - world
*
* @param world
* - world
*/
private void multiverseReg(World world) {
if (!isUseOwnGenerator(world) && Bukkit.getServer().getPluginManager().isPluginEnabled("Multiverse-Core")) {
Bukkit.getScheduler().runTask(plugin, () -> Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(),
MULTIVERSE_IMPORT + world.getName() + " normal -g " + plugin.getName()));
Bukkit.getScheduler().runTask(plugin,
() -> Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(),
MULTIVERSE_IMPORT + world.getName() + " normal -g " + plugin.getName()));
Bukkit.getScheduler().runTask(plugin, () -> {
if (!Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(),
MULTIVERSE_SET_GENERATOR + plugin.getName() + " " + world.getName())) {
@ -126,9 +133,11 @@ public class IslandWorldManager {
}
/**
* Should only be used by BSB-specific functions
*
* @return the islandWorld
*/
public World getIslandWorld() {
public World getBSBIslandWorld() {
if (plugin.getSettings().isUseOwnGenerator()) {
return Bukkit.getServer().getWorld(plugin.getSettings().getWorldName());
}
@ -136,9 +145,11 @@ public class IslandWorldManager {
}
/**
* Should only be used by BSB-specific functions
*
* @return the netherWorld
*/
public World getNetherWorld() {
public World getBSBNetherWorld() {
if (plugin.getSettings().isUseOwnGenerator()) {
return Bukkit.getServer().getWorld(plugin.getSettings().getWorldName() + NETHER);
}
@ -146,9 +157,11 @@ public class IslandWorldManager {
}
/**
* Should only be used by BSB-specific functions
*
* @return the endWorld
*/
public World getEndWorld() {
public World getBSBEndWorld() {
if (plugin.getSettings().isUseOwnGenerator()) {
return Bukkit.getServer().getWorld(plugin.getSettings().getWorldName() + THE_END);
}
@ -157,7 +170,9 @@ public class IslandWorldManager {
/**
* Checks if a location is in any of the island worlds
* @param loc - location
*
* @param loc
* - location
* @return true if in a world or false if not
*/
public boolean inWorld(Location loc) {
@ -168,40 +183,51 @@ public class IslandWorldManager {
* @return List of over worlds
*/
public List<World> getOverWorlds() {
return worlds.keySet().stream().filter(w -> w.getEnvironment().equals(Environment.NORMAL)).collect(Collectors.toList());
return worlds.keySet().stream().filter(w -> w.getEnvironment().equals(Environment.NORMAL))
.collect(Collectors.toList());
}
/**
* Get friendly names of all the over worlds
*
* @return Set of world names
*/
public Set<String> getOverWorldNames() {
return worlds.entrySet().stream().filter(e -> e.getKey().getEnvironment().equals(Environment.NORMAL)).map(Map.Entry::getValue).collect(Collectors.toSet());
}
/**
* Get a set of world names that user does not already have an island in
* @param user - user
* @return set of world names, or empty set
*/
public Set<String> getFreeOverWorldNames(User user) {
return worlds.entrySet().stream().filter(e -> e.getKey().getEnvironment().equals(Environment.NORMAL))
.filter(w -> !plugin.getIslands().hasIsland(w.getKey(), user))
.map(Map.Entry::getValue).collect(Collectors.toSet());
}
/**
* Check if a name is a known friendly world name, ignores case
* @param name - world name
* @return true if name is a known world name
* Get a set of world names that user does not already have an island in
*
* @param user
* - user
* @return set of world names, or empty set
*/
public boolean isOverWorld(String name) {
return worlds.entrySet().stream().filter(e -> e.getKey().getEnvironment().equals(Environment.NORMAL)).anyMatch(w -> w.getValue().equalsIgnoreCase(name));
public Set<String> getFreeOverWorldNames(User user) {
return worlds.entrySet().stream().filter(e -> e.getKey().getEnvironment().equals(Environment.NORMAL))
.filter(w -> !plugin.getIslands().hasIsland(w.getKey(), user)).map(Map.Entry::getValue)
.collect(Collectors.toSet());
}
/**
* Add world to the list of known worlds along with a friendly name that will be used in commands
* @param world - world
* Check if a name is a known friendly world name, ignores case
*
* @param name
* - world name
* @return true if name is a known world name
*/
public boolean isOverWorld(String name) {
return worlds.entrySet().stream().filter(e -> e.getKey().getEnvironment().equals(Environment.NORMAL))
.anyMatch(w -> w.getValue().equalsIgnoreCase(name));
}
/**
* Add world to the list of known worlds along with a friendly name that will be
* used in commands
*
* @param world
* - world
*/
public void addWorld(World world, WorldSettings settings) {
String friendlyName = settings.getFriendlyName().isEmpty() ? world.getName() : settings.getFriendlyName();
@ -210,13 +236,17 @@ public class IslandWorldManager {
worldSettings.put(world, settings);
multiverseReg(world);
// Set default island settings
Flags.values().stream().filter(f -> f.getType().equals(Flag.Type.PROTECTION)).forEach(f -> settings.getDefaultIslandFlags().putIfAbsent(f, f.getDefaultRank()));
Flags.values().stream().filter(f -> f.getType().equals(Flag.Type.SETTING)).forEach(f -> settings.getDefaultIslandSettings().putIfAbsent(f, f.getDefaultRank()));
Flags.values().stream().filter(f -> f.getType().equals(Flag.Type.PROTECTION))
.forEach(f -> settings.getDefaultIslandFlags().putIfAbsent(f, f.getDefaultRank()));
Flags.values().stream().filter(f -> f.getType().equals(Flag.Type.SETTING))
.forEach(f -> settings.getDefaultIslandSettings().putIfAbsent(f, f.getDefaultRank()));
}
/**
* Get the settings for this world or sub-worlds (nether, end)
* @param world - world
*
* @param world
* - world
* @return world settings, or null if world is unknown
*/
public WorldSettings getWorldSettings(World world) {
@ -225,11 +255,14 @@ public class IslandWorldManager {
/**
* Get the world based on friendly name.
* @param friendlyName - friendly name of world
*
* @param friendlyName
* - friendly name of world
* @return world, or null if it does not exist
*/
public World getWorld(String friendlyName) {
return worlds.entrySet().stream().filter(n -> n.getValue().equalsIgnoreCase(friendlyName)).map(Map.Entry::getKey).findFirst().orElse(null);
return worlds.entrySet().stream().filter(n -> n.getValue().equalsIgnoreCase(friendlyName))
.map(Map.Entry::getKey).findFirst().orElse(null);
}
/**
@ -353,7 +386,9 @@ public class IslandWorldManager {
/**
* Checks if a world is a known nether world
* @param world - world
*
* @param world
* - world
* @return true if world is a known and valid nether world
*/
public boolean isNether(World world) {
@ -363,17 +398,22 @@ public class IslandWorldManager {
/**
* Checks if a world is a known island nether world
* @param world - world
*
* @param world
* - world
* @return true if world is a known and valid nether world
*/
public boolean isIslandNether(World world) {
World w = Util.getWorld(world);
return worldSettings.containsKey(w) && worldSettings.get(w).isNetherGenerate() && worldSettings.get(w).isNetherIslands();
return worldSettings.containsKey(w) && worldSettings.get(w).isNetherGenerate()
&& worldSettings.get(w).isNetherIslands();
}
/**
* Checks if a world is a known end world
* @param world - world
*
* @param world
* - world
* @return true if world is a known and valid nether world
*/
public boolean isEnd(World world) {
@ -383,17 +423,22 @@ public class IslandWorldManager {
/**
* Checks if a world is a known island end world
* @param world - world
*
* @param world
* - world
* @return true if world is a known and valid nether world
*/
public boolean isIslandEnd(World world) {
World w = Util.getWorld(world);
return worldSettings.containsKey(w) && worldSettings.get(w).isEndGenerate() && worldSettings.get(w).isEndIslands();
return worldSettings.containsKey(w) && worldSettings.get(w).isEndGenerate()
&& worldSettings.get(w).isEndIslands();
}
/**
* Get the nether world of this overWorld
* @param overWorld - overworld
*
* @param overWorld
* - overworld
* @return nether world, or null if it does not exist
*/
public World getNetherWorld(World overWorld) {
@ -402,7 +447,9 @@ public class IslandWorldManager {
/**
* Get the end world of this overWorld
* @param overWorld - overworld
*
* @param overWorld
* - overworld
* @return end world, or null if it does not exist
*/
public World getEndWorld(World overWorld) {
@ -411,7 +458,9 @@ public class IslandWorldManager {
/**
* Check if nether trees should be created in the nether or not
* @param world - world
*
* @param world
* - world
* @return true or false
*/
public boolean isNetherTrees(World world) {
@ -421,7 +470,9 @@ public class IslandWorldManager {
/**
* Whether the End Dragon can spawn or not in this world
* @param world - world
*
* @param world
* - world
* @return true (default) if it can spawn or not
*/
public boolean isDragonSpawn(World world) {
@ -443,16 +494,21 @@ public class IslandWorldManager {
/**
* Gets world from friendly name
* @param friendlyWorldName - friendly world name. Used for commands.
*
* @param friendlyWorldName
* - friendly world name. Used for commands.
* @return world, or null if not known
*/
public World getIslandWorld(String friendlyWorldName) {
return worlds.entrySet().stream().filter(e -> e.getValue().equalsIgnoreCase(friendlyWorldName)).findFirst().map(Map.Entry::getKey).orElse(null);
return worlds.entrySet().stream().filter(e -> e.getValue().equalsIgnoreCase(friendlyWorldName)).findFirst()
.map(Map.Entry::getKey).orElse(null);
}
/**
* Get max team size for this world
* @param world - world
*
* @param world
* - world
* @return max team size
*/
public int getMaxTeamSize(World world) {
@ -461,7 +517,9 @@ public class IslandWorldManager {
/**
* Get max homes for world
* @param world - world
*
* @param world
* - world
* @return max homes
*/
public int getMaxHomes(World world) {
@ -470,7 +528,9 @@ public class IslandWorldManager {
/**
* Get the friendly name for world or related nether or end
* @param world - world
*
* @param world
* - world
* @return Friendly name
*/
public String getFriendlyName(World world) {
@ -479,7 +539,9 @@ public class IslandWorldManager {
/**
* Get the permission prefix for this world. No trailing dot included.
* @param world - world
*
* @param world
* - world
* @return permission prefix for this world
*/
public String getPermissionPrefix(World world) {
@ -489,7 +551,9 @@ public class IslandWorldManager {
/**
* Get the invincible visitor settings for this world
* @param world - world
*
* @param world
* - world
* @return invisible visitor settings
*/
public List<String> getIvSettings(World world) {
@ -497,10 +561,13 @@ public class IslandWorldManager {
}
/**
* Returns whether a world flag is set or not
* Same result as calling {@link Flag#isSetForWorld(World)}
* @param world - world
* @param flag - world setting flag
* Returns whether a world flag is set or not Same result as calling
* {@link Flag#isSetForWorld(World)}
*
* @param world
* - world
* @param flag
* - world setting flag
* @return true or false
*/
public boolean isWorldFlag(World world, Flag flag) {
@ -509,7 +576,9 @@ public class IslandWorldManager {
/**
* Get the default game mode for this world.
* @param world - world
*
* @param world
* - world
* @return GameMode: SURVIVAL, CREATIVE, ADVENTURE, SPECTATOR
*/
public GameMode getDefaultGameMode(World world) {
@ -518,7 +587,9 @@ public class IslandWorldManager {
/**
* Get the set of entity types not to remove when player teleports to island
* @param world - world
*
* @param world
* - world
* @return - set of entity types
*/
public Set<EntityType> getRemoveMobsWhitelist(World world) {
@ -568,16 +639,21 @@ public class IslandWorldManager {
}
/**
* The data folder for the addon that registered this world, or the plugin's data folder if none found
* The data folder for the addon that registered this world, or the plugin's
* data folder if none found
*
* @return
*/
public File getDataFolder(World world) {
return worldSettings.get(Util.getWorld(world)).getAddon().map(Addon::getDataFolder).orElse(plugin.getDataFolder());
return worldSettings.get(Util.getWorld(world)).getAddon().map(Addon::getDataFolder)
.orElse(plugin.getDataFolder());
}
/**
* Get the addon associated with this world set
* @param world - world
*
* @param world
* - world
* @return Addon, or empty
*/
public Optional<Addon> getAddon(World world) {
@ -586,7 +662,9 @@ public class IslandWorldManager {
/**
* Get default island flag settings for this world.
* @param world - world
*
* @param world
* - world
* @return default rank settings for new islands.
*/
public Map<Flag, Integer> getDefaultIslandFlags(World world) {
@ -599,7 +677,9 @@ public class IslandWorldManager {
/**
* Return island setting defaults for world
* @param world - world
*
* @param world
* - world
* @return default settings for new islands
*/
public Map<Flag, Integer> getDefaultIslandSettings(World world) {

3
src/main/java/us/tastybento/bskyblock/managers/SchemsManager.java
View File

@ -73,6 +73,7 @@ public class SchemsManager {
}
private boolean loadSchem(World world, String name) {
plugin.log("Loading " + name + ".schem for " + world.getName());
File schems = new File(plugin.getIWM().getDataFolder(world), "schems");
copySchems(schems, world, name);
try {
@ -96,6 +97,8 @@ public class SchemsManager {
public void paste(World world, Island island, Runnable task) {
if (islandSchems.containsKey(world)) {
islandSchems.get(world).paste(world, island, task);
} else {
plugin.logError("Tried to paste schem for " + world.getName() + " but it is not loaded!");
}
}

5
src/main/java/us/tastybento/bskyblock/managers/island/NewIsland.java
View File

@ -143,14 +143,13 @@ public class NewIsland {
// Teleport player after this island is built
plugin.getIslands().homeTeleport(world, user.getPlayer(), true);
});
// Make nether island
if (plugin.getSettings().isNetherGenerate() && plugin.getSettings().isNetherIslands() && plugin.getIWM().getNetherWorld() != null) {
if (plugin.getIWM().isNetherGenerate(world) && plugin.getIWM().isNetherIslands(world) && plugin.getIWM().getNetherWorld(world) != null) {
plugin.getSchemsManager().paste(plugin.getIWM().getNetherWorld(world), island);
}
// Make end island
if (plugin.getSettings().isEndGenerate() && plugin.getSettings().isEndIslands() && plugin.getIWM().getEndWorld() != null) {
if (plugin.getIWM().isEndGenerate(world) && plugin.getIWM().isEndIslands(world) && plugin.getIWM().getEndWorld(world) != null) {
plugin.getSchemsManager().paste(plugin.getIWM().getEndWorld(world), island);
}

4
src/main/java/us/tastybento/bskyblock/util/DeleteIslandChunks.java
View File

@ -39,11 +39,11 @@ public class DeleteIslandChunks {
for (int z = minZChunk; z<=maxZChunk; z++) {
world.regenerateChunk(x, z);
if (plugin.getIWM().isNetherGenerate(world) && plugin.getIWM().isNetherIslands(world)) {
plugin.getIWM().getNetherWorld().regenerateChunk(x, z);
plugin.getIWM().getNetherWorld(world).regenerateChunk(x, z);
}
if (plugin.getIWM().isEndGenerate(world) && plugin.getIWM().isEndIslands(world)) {
plugin.getIWM().getEndWorld().regenerateChunk(x, z);
plugin.getIWM().getEndWorld(world).regenerateChunk(x, z);
}
}
}

6
src/test/java/bskyblock/TestBSkyBlock.java
View File

@ -145,9 +145,9 @@ public class TestBSkyBlock {
// Worlds
IslandWorldManager iwm = mock(IslandWorldManager.class);
Mockito.when(plugin.getIWM()).thenReturn(iwm);
Mockito.when(iwm.getIslandWorld()).thenReturn(world);
Mockito.when(iwm.getNetherWorld()).thenReturn(world);
Mockito.when(iwm.getEndWorld()).thenReturn(world);
Mockito.when(iwm.getBSBIslandWorld()).thenReturn(world);
Mockito.when(iwm.getBSBNetherWorld()).thenReturn(world);
Mockito.when(iwm.getBSBEndWorld()).thenReturn(world);
when(iwm.inWorld(any())).thenReturn(true);
PowerMockito.mockStatic(Util.class);
when(Util.getWorld(Mockito.any())).thenReturn(world);

2
src/test/java/us/tastybento/bskyblock/commands/AdminCommandTest.java
View File

@ -62,7 +62,7 @@ public class AdminCommandTest {
Whitebox.setInternalState(BSkyBlock.class, "instance", plugin);
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(plugin.getIWM()).thenReturn(iwm);
}

2
src/test/java/us/tastybento/bskyblock/commands/IslandCommandTest.java
View File

@ -76,7 +76,7 @@ public class IslandCommandTest {
public void setup() {
// Island World Manager
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getWorld(Mockito.anyString())).thenReturn(world);
when(plugin.getIWM()).thenReturn(iwm);
}

2
src/test/java/us/tastybento/bskyblock/commands/admin/AdminInfoCommandTest.java
View File

@ -94,7 +94,7 @@ public class AdminInfoCommandTest {
// Island World Manager
IslandWorldManager iwm = mock(IslandWorldManager.class);
World world = mock(World.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getFriendlyName(Mockito.any())).thenReturn("BSkyBlock");
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/us/tastybento/bskyblock/commands/admin/AdminRegisterCommandTest.java
View File

@ -94,7 +94,7 @@ public class AdminRegisterCommandTest {
// Island World Manager
IslandWorldManager iwm = mock(IslandWorldManager.class);
World world = mock(World.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/us/tastybento/bskyblock/commands/admin/AdminUnregisterCommandTest.java
View File

@ -92,7 +92,7 @@ public class AdminUnregisterCommandTest {
// Island World Manager
IslandWorldManager iwm = mock(IslandWorldManager.class);
World world = mock(World.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/us/tastybento/bskyblock/commands/admin/teams/AdminTeamAddCommandTest.java
View File

@ -117,7 +117,7 @@ public class AdminTeamAddCommandTest {
// Island World Manager
IslandWorldManager iwm = mock(IslandWorldManager.class);
World world = mock(World.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getFriendlyName(Mockito.any())).thenReturn("BSkyBlock");
when(plugin.getIWM()).thenReturn(iwm);
}

2
src/test/java/us/tastybento/bskyblock/commands/admin/teams/AdminTeamDisbandCommandTest.java
View File

@ -92,7 +92,7 @@ public class AdminTeamDisbandCommandTest {
// Island World Manager
IslandWorldManager iwm = mock(IslandWorldManager.class);
World world = mock(World.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/us/tastybento/bskyblock/commands/admin/teams/AdminTeamKickCommandTest.java
View File

@ -95,7 +95,7 @@ public class AdminTeamKickCommandTest {
// Island World Manager
IslandWorldManager iwm = mock(IslandWorldManager.class);
World world = mock(World.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/us/tastybento/bskyblock/commands/admin/teams/AdminTeamMakeLeaderCommandTest.java
View File

@ -92,7 +92,7 @@ public class AdminTeamMakeLeaderCommandTest {
// Island World Manager
IslandWorldManager iwm = mock(IslandWorldManager.class);
World world = mock(World.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(plugin.getIWM()).thenReturn(iwm);

2
src/test/java/us/tastybento/bskyblock/listeners/NetherPortalsTest.java
View File

@ -87,7 +87,7 @@ public class NetherPortalsTest {
end = mock(World.class);
when(end.getEnvironment()).thenReturn(Environment.THE_END);
when(iwm.getEndWorld(Mockito.any())).thenReturn(end);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getNetherWorld(Mockito.any())).thenReturn(nether);
when(iwm.inWorld(any())).thenReturn(true);
when(iwm.getNetherSpawnRadius(Mockito.any())).thenReturn(100);

24
src/test/java/us/tastybento/bskyblock/listeners/ObsidianToLavaTest.java
View File

@ -55,7 +55,7 @@ public class ObsidianToLavaTest {
world = mock(World.class);
// Mock server
Server server = mock(Server.class);
Server server = mock(Server.class);
when(server.getLogger()).thenReturn(Logger.getAnonymousLogger());
when(server.getWorld("world")).thenReturn(world);
when(server.getVersion()).thenReturn("BSB_Mocking");
@ -97,14 +97,14 @@ public class ObsidianToLavaTest {
// Worlds
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(plugin.getIWM()).thenReturn(iwm);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getNetherWorld()).thenReturn(world);
when(iwm.getEndWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getNetherWorld(Mockito.any())).thenReturn(world);
when(iwm.getEndWorld(Mockito.any())).thenReturn(world);
// Mock up IslandsManager
IslandsManager im = mock(IslandsManager.class);
when(plugin.getIslands()).thenReturn(im);
// Mock up items and blocks
ItemStack item = mock(ItemStack.class);
Block clickedBlock = mock(Block.class);
@ -112,18 +112,18 @@ public class ObsidianToLavaTest {
when(clickedBlock.getY()).thenReturn(0);
when(clickedBlock.getZ()).thenReturn(0);
when(clickedBlock.getWorld()).thenReturn(world);
// Users
User.setPlugin(plugin);
// Put player in world
when(iwm.inWorld(Mockito.any())).thenReturn(true);
// Put player on island
when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(true);
// Set as survival
when(who.getGameMode()).thenReturn(GameMode.SURVIVAL);
// Locales
// Locales
LocalesManager lm = mock(LocalesManager.class);
when(plugin.getLocalesManager()).thenReturn(lm);
when(lm.get(any(), any())).thenReturn("mock translation");
@ -160,8 +160,8 @@ public class ObsidianToLavaTest {
when(clickedBlock.getType()).thenReturn(block);
// Create the event
testEvent(plugin, who, action, item, clickedBlock);
PlayerInteractEvent event = new PlayerInteractEvent(who, action, item, clickedBlock, BlockFace.EAST);
// Test not in world
@ -183,7 +183,7 @@ public class ObsidianToLavaTest {
// Test when player is not on island
when(im.userIsOnIsland(Mockito.any(), Mockito.any())).thenReturn(false);
assertFalse(listener.onPlayerInteract(event));
}

6
src/test/java/us/tastybento/bskyblock/listeners/flags/FireListenerTest.java
View File

@ -101,9 +101,9 @@ public class FireListenerTest {
// Worlds
iwm = mock(IslandWorldManager.class);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getNetherWorld()).thenReturn(world);
when(iwm.getEndWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getBSBNetherWorld()).thenReturn(world);
when(iwm.getBSBEndWorld()).thenReturn(world);
when(iwm.inWorld(any())).thenReturn(true);
when(plugin.getIWM()).thenReturn(iwm);

6
src/test/java/us/tastybento/bskyblock/listeners/flags/MobSpawnListenerTest.java
View File

@ -108,9 +108,9 @@ public class MobSpawnListenerTest {
// Worlds
iwm = mock(IslandWorldManager.class);
when(plugin.getIWM()).thenReturn(iwm);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getNetherWorld()).thenReturn(world);
when(iwm.getEndWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getBSBNetherWorld()).thenReturn(world);
when(iwm.getBSBEndWorld()).thenReturn(world);
when(iwm.inWorld(any(Location.class))).thenReturn(true);
when(plugin.getIWM()).thenReturn(iwm);

8
src/test/java/us/tastybento/bskyblock/managers/IslandsManagerTest.java
View File

@ -165,9 +165,9 @@ public class IslandsManagerTest {
// Worlds
iwm = mock(IslandWorldManager.class);
when(plugin.getIWM()).thenReturn(iwm);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getNetherWorld()).thenReturn(world);
when(iwm.getEndWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getBSBNetherWorld()).thenReturn(world);
when(iwm.getBSBEndWorld()).thenReturn(world);
when(iwm.inWorld(any())).thenReturn(true);
PowerMockito.mockStatic(Util.class);
@ -373,7 +373,7 @@ public class IslandsManagerTest {
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(plugin.getIWM()).thenReturn(iwm);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
IslandsManager manager = new IslandsManager(plugin);

6
src/test/java/us/tastybento/bskyblock/managers/PlayersManagerTest.java
View File

@ -75,9 +75,9 @@ public class PlayersManagerTest {
when(nether.getName()).thenReturn("world_nether");
end = mock(World.class);
when(end.getName()).thenReturn("world_the_end");
when(iwm.getEndWorld()).thenReturn(end);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getNetherWorld()).thenReturn(nether);
when(iwm.getBSBEndWorld()).thenReturn(end);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getBSBNetherWorld()).thenReturn(nether);
when(iwm.inWorld(any())).thenReturn(true);
when(plugin.getIWM()).thenReturn(iwm);

6
src/test/java/us/tastybento/bskyblock/managers/island/IslandCacheTest.java
View File

@ -52,9 +52,9 @@ public class IslandCacheTest {
// Worlds
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(plugin.getIWM()).thenReturn(iwm);
when(iwm.getIslandWorld()).thenReturn(world);
when(iwm.getNetherWorld()).thenReturn(world);
when(iwm.getEndWorld()).thenReturn(world);
when(iwm.getBSBIslandWorld()).thenReturn(world);
when(iwm.getBSBNetherWorld()).thenReturn(world);
when(iwm.getBSBEndWorld()).thenReturn(world);
when(iwm.inWorld(any())).thenReturn(true);
PowerMockito.mockStatic(Util.class);