Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-14 23:05:12 +01:00
Code Issues Projects Releases Wiki Activity

⚠️ Various changes to IslandsManager

Browse Source 
Fixed some Javadoc.
Renamed #getCount() to #getIslandCount().
Renamed #makeLeader() methods to #setOwner().
Removed the permPrefix parameter from #setOwner() methods.
This commit is contained in:
Florian CUNY 2018-10-27 16:32:06 +02:00
parent 9427d3dd46
commit b286bb3296
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
View File

@ -253,12 +253,12 @@ public class IslandsManager {
} }
} }
public int getCount(){ public int getIslandCount(){
return islandCache.size(); return islandCache.size();
} }
/** /**
* Gets the island for this player. If they are in a team, the team island is returned * Gets the island for this player. If they are in a team, the team island is returned.
* @param world - world to check * @param world - world to check
* @param user - user * @param user - user
* @return Island or null * @return Island or null
@ -268,7 +268,7 @@ public class IslandsManager {
} }
/** /**
* Gets the island for this player. If they are in a team, the team island is returned * Gets the island for this player. If they are in a team, the team island is returned.
* @param world - world to check * @param world - world to check
* @param uuid - user's uuid * @param uuid - user's uuid
* @return Island or null * @return Island or null
@ -280,8 +280,7 @@ public class IslandsManager {
/** /**
* Returns the island at the location or Optional empty if there is none. * Returns the island at the location or Optional empty if there is none.
* This includes the full island space, not just the protected area. * This includes the full island space, not just the protected area.
* Use {@link #getProtectedIslandAt(Location)} for only the protected * Use {@link #getProtectedIslandAt(Location)} for only the protected island space.
* island space.
* *
* @param location - the location * @param location - the location
* @return Optional Island object * @return Optional Island object
@ -593,7 +592,7 @@ public class IslandsManager {
/** /**
* @param uniqueId - unique ID * @param uniqueId - unique ID
* @return true if the player is the owner of their island, i.e., owner or team leader * @return true if the player is the owner of their island.
*/ */
public boolean isOwner(World world, UUID uniqueId) { public boolean isOwner(World world, UUID uniqueId) {
return hasIsland(world, uniqueId) && getIsland(world, uniqueId).getOwner().equals(uniqueId); return hasIsland(world, uniqueId) && getIsland(world, uniqueId).getOwner().equals(uniqueId);
@ -772,8 +771,8 @@ public class IslandsManager {
* @param user - the user who is issuing the command * @param user - the user who is issuing the command
* @param targetUUID - the current island member who is going to become the leader * @param targetUUID - the current island member who is going to become the leader
*/ */
public void makeLeader(World world, User user, UUID targetUUID, String permPrefix) { public void setOwner(World world, User user, UUID targetUUID) {
makeLeader(user, targetUUID, getIsland(world, targetUUID), permPrefix); setOwner(user, targetUUID, getIsland(world, targetUUID));
} }
/** /**
@ -782,7 +781,7 @@ public class IslandsManager {
* @param targetUUID - new leader * @param targetUUID - new leader
* @param island - island to register * @param island - island to register
*/ */
public void makeLeader(User user, UUID targetUUID, Island island, String permPrefix) { public void setOwner(User user, UUID targetUUID, Island island) {
islandCache.setOwner(island, targetUUID); islandCache.setOwner(island, targetUUID);
user.sendMessage("commands.island.team.setowner.name-is-the-owner", "[name]", plugin.getPlayers().getName(targetUUID)); user.sendMessage("commands.island.team.setowner.name-is-the-owner", "[name]", plugin.getPlayers().getName(targetUUID));
@ -792,7 +791,7 @@ public class IslandsManager {
target.sendMessage("commands.island.team.setowner.you-are-the-owner"); target.sendMessage("commands.island.team.setowner.you-are-the-owner");
if (target.isOnline()) { if (target.isOnline()) {
// Check if new leader has a different range permission than the island size // Check if new leader has a different range permission than the island size
int range = target.getPermissionValue(permPrefix + "island.range", plugin.getIWM().getIslandProtectionRange(Util.getWorld(island.getWorld()))); int range = target.getPermissionValue(plugin.getIWM().getAddon(island.getWorld()).get().getDescription().getName().toLowerCase() + ".island.range", plugin.getIWM().getIslandProtectionRange(Util.getWorld(island.getWorld())));
// Range can go up or down // Range can go up or down
if (range != island.getProtectionRange()) { if (range != island.getProtectionRange()) {
user.sendMessage("commands.admin.setrange.range-updated", TextVariables.NUMBER, String.valueOf(range)); user.sendMessage("commands.admin.setrange.range-updated", TextVariables.NUMBER, String.valueOf(range));