Merge pull request #29 from BONNe/master

Fix issue #24

src/main/java/world/bentobox/level/commands/AdminTop.java

@@ -45,8 +45,13 @@ public class AdminTop extends CompositeCommand {
             Island island = getPlugin().getIslands().getIsland(world, topTen.getKey());
             if (island != null) {
                 rank++;
-                String item = String.valueOf(rank) + ":" + island.getName() + " "
+                String item = user.getTranslation("admin.topten",
-                        + user.getTranslation("topten.islandLevel", "[level]", String.valueOf(topTen.getValue()));
+                    "[rank]",
+                    "[name]",
+                    "[level]",
+                    String.valueOf(rank),
+                    this.getPlugin().getPlayers().getUser(island.getOwner()).getName(),
+                    String.valueOf(topTen.getValue()));
                 user.sendRawMessage(item);
             }
         }

src/main/java/world/bentobox/level/commands/IslandTop.java

@@ -17,7 +17,9 @@ public class IslandTop extends CompositeCommand {
 
     @Override
     public boolean execute(User user, String label, List<String> list) {
-        plugin.getTopTen().getGUI(getWorld(), user, getPermissionPrefix());
+        if (user.isPlayer()) {
+            this.plugin.getTopTen().getGUI(getWorld(), user, getPermissionPrefix());
+        }
         return true;
     }
 

src/main/resources/locales/en-US.yml

@@ -10,6 +10,7 @@ admin:
   top:
     description: "show the top ten list"
     unknown-world: "&cUnknown world!"
+  topten: "[rank]. [name] - island level = [level]"
 
 island:
   level: 

src/test/java/world/bentobox/level/LevelPresenterTest.java

@@ -47,7 +47,7 @@ public class LevelPresenterTest {
         // In team
         when(im.inTeam(Mockito.any(), Mockito.any())).thenReturn(true);
         // team leader
-        when(im.getTeamLeader(Mockito.any(), Mockito.any())).thenReturn(UUID.randomUUID());
+        when(im.getOwner(Mockito.any(), Mockito.any())).thenReturn(UUID.randomUUID());
         
         pl = mock(PlayerLevel.class);
         PowerMockito.whenNew(PlayerLevel.class).withAnyArguments().thenReturn(pl);