Fixed scoreboard support for older minecraft versions. (Fixes #4)

Author: TuxCoding

README.md

@@ -3,6 +3,5 @@ McCombatLevel
 
 Bukkit plugin that creates and displays a combat level for mcMMO.
 
-See http://dev.bukkit.org/bukkit-plugins/mccombatlevel/
-
+See http://dev.bukkit.org/bukkit-plugins/mccombatlevel/ \\
     http://www.curse.com/bukkit-plugins/minecraft/mccombatlevel

pom.xml

@@ -9,7 +9,7 @@
     <name>McCombatLevel</name>
     <inceptionYear>2014</inceptionYear>
     <description>Displays a combat level above users heads and in chat based on their mcMMO stats that affect combat</description>
-    <version>1.7</version>
+    <version>1.7.2</version>
     <url>http://dev.bukkit.org/bukkit-plugins/mccombatlevel/</url>
 
     <properties>

src/main/java/com/gmail/mrphpfan/mccombatlevel/FastOfflinePlayer.java

@@ -0,0 +1,147 @@
+package com.gmail.mrphpfan.mccombatlevel;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Objects;
+import com.google.common.collect.Maps;
+
+import java.util.Map;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+/**
+ * Since 1.7 Bukkit introduced CraftServer.getOfflinePlayer(String name).
+ *
+ * This method is blocking as it looks up the cache. So it could cause lags
+ * on big servers. Because we only need the name this class is made.
+ *
+ * Bukkit already implemented methods to get around this problem, but the
+ * scoreboard team isn't yet modified for methods, which can be called just
+ * with a string.
+ *
+ * Servers <b>below 1.7</b> with use of this class doesn't need to search for the
+ * player.
+ *
+ * @see org.bukkit.Bukkit#getOfflinePlayer(java.lang.String)
+ */
+public class FastOfflinePlayer implements OfflinePlayer {
+
+    private final String playerName;
+
+    /**
+     * Creates a new instance based of this name
+     *
+     * @param playerName the player name
+     */
+    public FastOfflinePlayer(String playerName) {
+        this.playerName = playerName;
+    }
+
+    @Override
+    public boolean isOnline() {
+        //it's a fake player, so it won't be online
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return playerName;
+    }
+
+    @Override
+    public UUID getUniqueId() {
+        return UUID.nameUUIDFromBytes(playerName.getBytes(Charsets.UTF_8));
+    }
+
+    @Override
+    public boolean isBanned() {
+        return false;
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void setBanned(boolean banned) {
+        //ignore
+    }
+
+    @Override
+    public boolean isWhitelisted() {
+        return false;
+    }
+
+    @Override
+    public void setWhitelisted(boolean value) {
+        //ignore
+    }
+
+    @Override
+    public Player getPlayer() {
+        return null;
+    }
+
+    @Override
+    public long getFirstPlayed() {
+        return System.currentTimeMillis();
+    }
+
+    @Override
+    public long getLastPlayed() {
+        return System.currentTimeMillis();
+    }
+
+    @Override
+    public boolean hasPlayedBefore() {
+        return false;
+    }
+
+    @Override
+    public Location getBedSpawnLocation() {
+        return new Location(Bukkit.getWorlds().get(0), 0, 0, 0);
+    }
+
+    @Override
+    public boolean isOp() {
+        return false;
+    }
+
+    @Override
+    public void setOp(boolean value) {
+        //ignore
+    }
+
+    @Override
+    public Map<String, Object> serialize() {
+        final Map<String, Object> result = Maps.newLinkedHashMap();
+
+        result.put("UUID", getUniqueId().toString());
+        result.put("name", playerName);
+
+        return result;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(playerName);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        //check for null too
+        if (!(obj instanceof FastOfflinePlayer)) {
+            return false;
+        }
+
+        final FastOfflinePlayer other = (FastOfflinePlayer) obj;
+        return Objects.equal(playerName, other.playerName);
+    }
+
+    @Override
+    public String toString() {
+        return Objects.toStringHelper(this)
+                .add("playerName", playerName)
+                .toString();
+    }
+}

src/main/java/com/gmail/mrphpfan/mccombatlevel/McCombatLevel.java

@@ -28,6 +28,7 @@ public class McCombatLevel extends JavaPlugin {
     private final Map<String, Integer> playerLevels = Maps.newConcurrentMap();
 
     private LevelCalculator levelCalculator;
+    private boolean oldScoreboardAPI;
 
     private Scoreboard board;
     private Objective objective;
@@ -55,12 +56,17 @@ public ChatColor getPrefixColor() {
         return prefixLevel;
     }
 
+    public void setLevelCalculator(LevelCalculator newCalculator) {
+        levelCalculator = newCalculator;
+    }
+
     @Override
     public void onEnable() {
         loadConfiguration();
 
-
         if (enableTag) {
+            oldScoreboardAPI = isOldScoreboardAPI();
+
             //Choose the main scoreboard in order to be compatible with for example ColoredTags
             board = getServer().getScoreboardManager().getMainScoreboard();
 
@@ -117,20 +123,28 @@ public void setLevel(Player player, int level) {
 
         if (enableTag && player.hasPermission(getName().toLowerCase() + ".showLevelTag")) {
             //set the score on the scoreboard
-            objective.getScore(playerName).setScore(level);
+            if (oldScoreboardAPI) {
+                objective.getScore(new FastOfflinePlayer(playerName)).setScore(level);
+            } else {
+                objective.getScore(playerName).setScore(level);
+            }
         }
     }
 
     public void removeCachedLevels(Player player) {
         final String playerName = player.getName();
         playerLevels.remove(playerName);
         //prevent that objective will be too big
-        board.resetScores(playerName);
+        if (oldScoreboardAPI) {
+            board.resetScores(new FastOfflinePlayer(playerName));
+        } else {
+            board.resetScores(playerName);
+        }
     }
 
     public void updateLevel(Player player) {
-        //Check if the player is loaded without exceptions, but with backwards compatibility
         if (UserManager.hasPlayerDataKey(player)) {
+            //Check if the player is loaded without exceptions, but with backwards compatibility
             int newLevel = calculateLevel(UserManager.getPlayer(player));
             setLevel(player, newLevel);
         }
@@ -201,4 +215,17 @@ private void removeObjective() {
             toRemove.unregister();
         }
     }
+
+    private boolean isOldScoreboardAPI() {
+        try {
+            Objective.class.getDeclaredMethod("getScore", String.class);
+        } catch (NoSuchMethodException noSuchMethodEx) {
+            //since we have an extra class for it (FastOfflinePlayer)
+            //we can fail silently
+            return true;
+        }
+
+        //We have access to the new method
+        return false;
+    }
 }

src/main/java/com/gmail/mrphpfan/mccombatlevel/PlayerListener.java

@@ -24,8 +24,8 @@ public PlayerListener(McCombatLevel plugin) {
     }
 
     @EventHandler(ignoreCancelled = true)
-    public void onPlayerJoinEvent(PlayerJoinEvent event) {
-        final Player player = event.getPlayer();
+    public void onPlayerJoinEvent(PlayerJoinEvent joinEvent) {
+        final Player player = joinEvent.getPlayer();
 
         Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
 
@@ -36,7 +36,7 @@ public void run() {
                     plugin.updateLevel(player);
                 }
             }
-        }, 3 * 20L);
+        }, 5 * 20L);
 
         //send them the scoreboard
         if (plugin.isTagEnabled()) {
@@ -45,42 +45,42 @@ public void run() {
     }
 
     @EventHandler
-    public void onPlayerLogout(PlayerQuitEvent event) {
+    public void onPlayerLogout(PlayerQuitEvent quitEvent) {
         //remove the player from the cache
-        plugin.removeCachedLevels(event.getPlayer());
+        plugin.removeCachedLevels(quitEvent.getPlayer());
     }
 
     //set it to low in order to update the level before other plugins want to get that value
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
-    public void onPlayerLevelUp(McMMOPlayerLevelUpEvent event) {
-        SkillType skill = event.getSkill();
+    public void onPlayerLevelUp(McMMOPlayerLevelUpEvent levelUpEvent) {
+        SkillType skill = levelUpEvent.getSkill();
 
         //only level up combat if one of the following was leveled
         if (skill.equals(SkillType.SWORDS) || skill.equals(SkillType.ARCHERY)
                 || skill.equals(SkillType.AXES) || skill.equals(SkillType.UNARMED)
                 || skill.equals(SkillType.TAMING) || skill.equals(SkillType.ACROBATICS)) {
-            plugin.updateLevel(event.getPlayer());
+            plugin.updateLevel(levelUpEvent.getPlayer());
         }
     }
 
     //some chat plugins listen and change stuff on the default priority. In order
     //to see these changes we need an higher priority.
     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
-    public void onChat(AsyncPlayerChatEvent event) {
+    public void onChat(AsyncPlayerChatEvent chatEvent) {
         if (!plugin.isPrefixEnabled()) {
             //check if prefix is enabled
             return;
         }
 
-        Integer combatLevel = plugin.getCombatLevel(event.getPlayer());
-        String format = event.getFormat();
+        Integer combatLevel = plugin.getCombatLevel(chatEvent.getPlayer());
+        String format = chatEvent.getFormat();
         if (format.contains(CHAT_VARIABLE)) {
             String level = "";
             if (combatLevel != null) {
                 level = combatLevel.toString();
             }
 
-            event.setFormat(format.replace(CHAT_VARIABLE, level));
+            chatEvent.setFormat(format.replace(CHAT_VARIABLE, level));
             //variable found - do not append the tag manually
             return;
         }
@@ -89,8 +89,8 @@ public void onChat(AsyncPlayerChatEvent event) {
         if (combatLevel != null) {
             ChatColor prefixColor = plugin.getPrefixColor();
             ChatColor prefixBracket = plugin.getPrefixBracket();
-            event.setFormat(prefixBracket + "[" + prefixColor + combatLevel + prefixBracket + "]"
-                    + ChatColor.RESET + event.getFormat());
+            chatEvent.setFormat(prefixBracket + "[" + prefixColor + combatLevel + prefixBracket + "]"
+                    + ChatColor.RESET + chatEvent.getFormat());
         }
     }
 }

src/main/resources/plugin.yml

@@ -16,10 +16,10 @@ depend: [mcMMO]
 
 commands:
   # choose a possible unique name
-  combatlevel:
+  ${project.artifactId}:
     description: 'See the combat level'
     usage: /<command> [player]
-    aliases: [level]
+    aliases: [level, combatlevel]
 
 permissions:
     mccombatlevel.*: