Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid method name clash

Browse Source
This commit is contained in:
Olof Larsson 2013-06-11 09:13:30 +02:00
parent 226fcfe32f
commit 7de7d30e28
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/massivecraft/mcore/cmd/arg/ARWorldId.java
View File

@ -33,13 +33,13 @@ public class ARWorldId extends ARAbstractSelect<String>
for (String worldId : visibleWorldIds) for (String worldId : visibleWorldIds)
{ {
if (!Mixin.canSee(sender, worldId)) continue; if (!Mixin.canSeeWorld(sender, worldId)) continue;
if (arg.equalsIgnoreCase(worldId)) return worldId; if (arg.equalsIgnoreCase(worldId)) return worldId;
} }
for (String worldId : visibleWorldIds) for (String worldId : visibleWorldIds)
{ {
if (!Mixin.canSee(sender, worldId)) continue; if (!Mixin.canSeeWorld(sender, worldId)) continue;
for (String worldAlias : Mixin.getWorldAliases(worldId)) for (String worldAlias : Mixin.getWorldAliases(worldId))
{ {
if (arg.equalsIgnoreCase(worldAlias)) return worldId; if (arg.equalsIgnoreCase(worldAlias)) return worldId;
@ -55,7 +55,7 @@ public class ARWorldId extends ARAbstractSelect<String>
List<String> ret = new ArrayList<String>(); List<String> ret = new ArrayList<String>();
for (String worldId : Mixin.getWorldIds()) for (String worldId : Mixin.getWorldIds())
{ {
if (!Mixin.canSee(sender, worldId)) continue; if (!Mixin.canSeeWorld(sender, worldId)) continue;
ret.add(Mixin.getWorldDisplayName(worldId)); ret.add(Mixin.getWorldDisplayName(worldId));
} }
return ret; return ret;

4
src/com/massivecraft/mcore/mixin/Mixin.java
View File

@ -69,9 +69,9 @@ public class Mixin
// STATIC EXPOSE: WORLD // 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<String> getWorldIds() public static List<String> getWorldIds()

2
src/com/massivecraft/mcore/mixin/WorldMixin.java
View File

@ -10,7 +10,7 @@ import com.massivecraft.mcore.ps.PS;
public interface WorldMixin public interface WorldMixin
{ {
public boolean canSee(Permissible permissible, String worldId); public boolean canSeeWorld(Permissible permissible, String worldId);
public List<String> getWorldIds(); public List<String> getWorldIds();

2
src/com/massivecraft/mcore/mixin/WorldMixinAbstract.java
View File

@ -17,7 +17,7 @@ public abstract class WorldMixinAbstract implements WorldMixin
List<String> ret = new ArrayList<String>(); List<String> ret = new ArrayList<String>();
for (String worldId : this.getWorldIds()) for (String worldId : this.getWorldIds())
{ {
if (!this.canSee(permissible, worldId)) continue; if (!this.canSeeWorld(permissible, worldId)) continue;
ret.add(worldId); ret.add(worldId);
} }
return ret; return ret;

2
src/com/massivecraft/mcore/mixin/WorldMixinDefault.java
View File

@ -28,7 +28,7 @@ public class WorldMixinDefault extends WorldMixinAbstract
// -------------------------------------------- // // -------------------------------------------- //
@Override @Override
public boolean canSee(Permissible permissible, String worldId) public boolean canSeeWorld(Permissible permissible, String worldId)
{ {
return true; return true;
} }