From 7f7f5db99de64bd23ca86e7f45655251ac0da673 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 25 Aug 2013 11:41:49 +0200 Subject: [PATCH] Remove old stuff in player util that nowadays we use Mixin for. --- .../massivecraft/mcore/util/PlayerUtil.java | 147 ------------------ 1 file changed, 147 deletions(-) diff --git a/src/com/massivecraft/mcore/util/PlayerUtil.java b/src/com/massivecraft/mcore/util/PlayerUtil.java index 5420725a..51fe9b18 100644 --- a/src/com/massivecraft/mcore/util/PlayerUtil.java +++ b/src/com/massivecraft/mcore/util/PlayerUtil.java @@ -1,11 +1,6 @@ package com.massivecraft.mcore.util; -import java.io.File; -import java.util.Map; import java.util.Set; -import java.util.TreeSet; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListSet; import net.minecraft.server.v1_6_R2.EntityPlayer; @@ -18,7 +13,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.plugin.Plugin; @@ -30,23 +24,6 @@ public class PlayerUtil implements Listener // FIELDS // -------------------------------------------- // - /** - * We will use this folder later. - */ - public static File playerDirectory = MUtil.getPlayerDirectory(); - - /** - * This map is populated using the player.dat files on disk. - * It is also populated when a player tries to log in to the server. - */ - protected static Map nameToCorrectName = new ConcurrentSkipListMap(String.CASE_INSENSITIVE_ORDER); - - /** - * This map is used to improve the speed of name start lookups. - * Note that the keys in this map is lowercase. - */ - protected static Map> lowerCaseStartOfNameToCorrectNames = new ConcurrentSkipListMap>(); - protected static Set joinedPlayerNames = new ConcurrentSkipListSet(String.CASE_INSENSITIVE_ORDER); // -------------------------------------------- // @@ -56,11 +33,6 @@ public class PlayerUtil implements Listener public PlayerUtil(Plugin plugin) { Bukkit.getPluginManager().registerEvents(this, plugin); - - for (String playername : MUtil.getPlayerDirectoryNames()) - { - nameToCorrectName.put(playername, playername); - } joinedPlayerNames.clear(); for (Player player : Bukkit.getOnlinePlayers()) @@ -69,25 +41,6 @@ public class PlayerUtil implements Listener } } - @EventHandler(priority = EventPriority.LOWEST) - public void onLowestPlayerLoginEvent(PlayerLoginEvent event) - { - String newPlayerName = event.getPlayer().getName(); - String lowercaseNewPlayerName = newPlayerName.toLowerCase(); - - // Add this name to the case-corrector map - nameToCorrectName.put(newPlayerName, newPlayerName); - - // Update the cache - for (Entry> entry : lowerCaseStartOfNameToCorrectNames.entrySet()) - { - if (lowercaseNewPlayerName.startsWith(entry.getKey())) - { - entry.getValue().add(newPlayerName); - } - } - } - @EventHandler(priority = EventPriority.MONITOR) public void joinMonitor(PlayerJoinEvent event) { @@ -119,106 +72,6 @@ public class PlayerUtil implements Listener return joinedPlayerNames.contains(player.getName()); } - public static Set getAllVisitorNames() - { - return nameToCorrectName.keySet(); - } - - /** - * This method takes a player name and returns the same name but with correct case. - * Null is returned if the correct case can not be determined. - */ - public static String fixPlayerNameCase(final String playerName) - { - return nameToCorrectName.get(playerName); - } - - /** - * Find all player names starting with a certain string (not case sensitive). - * This method will return the names of offline players as well as online players. - */ - public static Set getAllPlayerNamesCaseinsensitivelyStartingWith(final String startOfName) - { - Set ret = new TreeSet(String.CASE_INSENSITIVE_ORDER); - - String lowercaseStartOfName = startOfName.toLowerCase(); - - // Try to fetch from the cache - Set cachedNames = lowerCaseStartOfNameToCorrectNames.get(lowercaseStartOfName); - if (cachedNames != null) - { - ret.addAll(cachedNames); - return ret; - } - - // Build it the hard way if cache did not exist - - ret = new TreeSet(String.CASE_INSENSITIVE_ORDER); - for (String correctName : nameToCorrectName.values()) - { - if (correctName.toLowerCase().startsWith(lowercaseStartOfName)) - { - ret.add(correctName); - } - } - - // Add it to the cache - Set shallowCopyForCache = new TreeSet(String.CASE_INSENSITIVE_ORDER); - shallowCopyForCache.addAll(ret); - lowerCaseStartOfNameToCorrectNames.put(lowercaseStartOfName, shallowCopyForCache); - - return ret; - } - - /** - * In Minecraft a playername can be 16 characters long. One sign line is however only 15 characters long. - * If we find a 15 character long playername on a sign it could thus refer to more than one player. - * This method finds all possible matching player names. - */ - public static Set interpretPlayerNameFromSign(String playerNameFromSign) - { - Set ret = new TreeSet(String.CASE_INSENSITIVE_ORDER); - - if (playerNameFromSign.length() > 15) - { - // This case will in reality not happen. - ret.add(playerNameFromSign); - return ret; - } - - if (playerNameFromSign.length() == 15) - { - ret.addAll(PlayerUtil.getAllPlayerNamesCaseinsensitivelyStartingWith(playerNameFromSign)); - } - else - { - String fixedPlayerName = PlayerUtil.fixPlayerNameCase(playerNameFromSign); - if (fixedPlayerName != null) - { - ret.add(fixedPlayerName); - } - } - - return ret; - } - - /** - * It seems the OfflinePlayer#getLastPlayed in Bukkit is broken. - * It occasionally returns invalid values. Therefore we use this instead. - * The playerName must be the full name but is not case sensitive. - */ - public static long getLastPlayed(String playerName) - { - String playerNameCC = fixPlayerNameCase(playerName); - if (playerNameCC == null) return 0; - - Player player = Bukkit.getPlayerExact(playerNameCC); - if (player != null && player.isOnline()) return System.currentTimeMillis(); - - File playerFile = new File(playerDirectory, playerNameCC+".dat"); - return playerFile.lastModified(); - } - /** * Updates the players food and health information. */