diff --git a/src/com/massivecraft/mcore/cmd/arg/ARWorldId.java b/src/com/massivecraft/mcore/cmd/arg/ARWorldId.java index ac818d17..2cfaf715 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARWorldId.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARWorldId.java @@ -33,13 +33,13 @@ public class ARWorldId extends ARAbstractSelect for (String worldId : visibleWorldIds) { - if (!Mixin.canSee(sender, worldId)) continue; + if (!Mixin.canSeeWorld(sender, worldId)) continue; if (arg.equalsIgnoreCase(worldId)) return worldId; } for (String worldId : visibleWorldIds) { - if (!Mixin.canSee(sender, worldId)) continue; + if (!Mixin.canSeeWorld(sender, worldId)) continue; for (String worldAlias : Mixin.getWorldAliases(worldId)) { if (arg.equalsIgnoreCase(worldAlias)) return worldId; @@ -55,7 +55,7 @@ public class ARWorldId extends ARAbstractSelect List ret = new ArrayList(); for (String worldId : Mixin.getWorldIds()) { - if (!Mixin.canSee(sender, worldId)) continue; + if (!Mixin.canSeeWorld(sender, worldId)) continue; ret.add(Mixin.getWorldDisplayName(worldId)); } return ret; diff --git a/src/com/massivecraft/mcore/mixin/Mixin.java b/src/com/massivecraft/mcore/mixin/Mixin.java index 55c19d50..53f104a5 100644 --- a/src/com/massivecraft/mcore/mixin/Mixin.java +++ b/src/com/massivecraft/mcore/mixin/Mixin.java @@ -69,9 +69,9 @@ public class Mixin // STATIC EXPOSE: WORLD // -------------------------------------------- // - public static boolean canSee(Permissible permissible, String worldId) + public static boolean canSeeWorld(Permissible permissible, String worldId) { - return getWorldMixin().canSee(permissible, worldId); + return getWorldMixin().canSeeWorld(permissible, worldId); } public static List getWorldIds() diff --git a/src/com/massivecraft/mcore/mixin/WorldMixin.java b/src/com/massivecraft/mcore/mixin/WorldMixin.java index 60b74bbd..600ca07f 100644 --- a/src/com/massivecraft/mcore/mixin/WorldMixin.java +++ b/src/com/massivecraft/mcore/mixin/WorldMixin.java @@ -10,7 +10,7 @@ import com.massivecraft.mcore.ps.PS; public interface WorldMixin { - public boolean canSee(Permissible permissible, String worldId); + public boolean canSeeWorld(Permissible permissible, String worldId); public List getWorldIds(); diff --git a/src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java b/src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java index baa6c0af..b50a4369 100644 --- a/src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java +++ b/src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java @@ -17,7 +17,7 @@ public abstract class WorldMixinAbstract implements WorldMixin List ret = new ArrayList(); for (String worldId : this.getWorldIds()) { - if (!this.canSee(permissible, worldId)) continue; + if (!this.canSeeWorld(permissible, worldId)) continue; ret.add(worldId); } return ret; diff --git a/src/com/massivecraft/mcore/mixin/WorldMixinDefault.java b/src/com/massivecraft/mcore/mixin/WorldMixinDefault.java index 4ee0ab2a..ee741b58 100644 --- a/src/com/massivecraft/mcore/mixin/WorldMixinDefault.java +++ b/src/com/massivecraft/mcore/mixin/WorldMixinDefault.java @@ -28,7 +28,7 @@ public class WorldMixinDefault extends WorldMixinAbstract // -------------------------------------------- // @Override - public boolean canSee(Permissible permissible, String worldId) + public boolean canSeeWorld(Permissible permissible, String worldId) { return true; }