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

Merge branch 'develop' into addons

This commit is contained in:
Tastybento 2017-12-27 14:03:52 -08:00
parent 4fc33cb9f7 fcaa3514ac
commit f80a933c34
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java
View File

@ -58,10 +58,6 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
* The command chain from the very top, e.g., /island team promote * The command chain from the very top, e.g., /island team promote
*/ */
private String usage; private String usage;
/**
* BSkyBlock plugin
*/
private BSkyBlock bsb;
/** /**
* Sub-command constructor * Sub-command constructor
@ -188,7 +184,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
* @return IslandsManager * @return IslandsManager
*/ */
protected IslandsManager getIslands() { protected IslandsManager getIslands() {
return bsb.getIslands(); return getPlugin().getIslands();
} }
/** /**
@ -205,7 +201,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
* @return set of UUIDs of all team members * @return set of UUIDs of all team members
*/ */
protected Set<UUID> getMembers(User user) { protected Set<UUID> getMembers(User user) {
return bsb.getIslands().getMembers(user.getUniqueId()); return getPlugin().getIslands().getMembers(user.getUniqueId());
} }
/** /**
@ -225,13 +221,12 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
* @return PlayersManager * @return PlayersManager
*/ */
protected PlayersManager getPlayers() { protected PlayersManager getPlayers() {
return bsb.getPlayers(); return getPlugin().getPlayers();
} }
@Override @Override
public BSkyBlock getPlugin() { public BSkyBlock getPlugin() {
this.bsb = BSkyBlock.getPlugin(); return BSkyBlock.getPlugin();
return this.bsb;
} }
/** /**
@ -261,7 +256,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
* @return UUID of player's team leader * @return UUID of player's team leader
*/ */
protected UUID getTeamLeader(User user) { protected UUID getTeamLeader(User user) {
return bsb.getIslands().getTeamLeader(user.getUniqueId()); return getPlugin().getIslands().getTeamLeader(user.getUniqueId());
} }
@ -323,7 +318,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
* @return true if player is in a team * @return true if player is in a team
*/ */
protected boolean inTeam(User user) { protected boolean inTeam(User user) {
return bsb.getPlayers().inTeam(user.getUniqueId()); return getPlugin().getPlayers().inTeam(user.getUniqueId());
} }
/** /**