Don't need getCommandMap() here.

This commit is contained in:
Steven Lawson 2013-04-09 22:13:31 -04:00
parent 14442d66ee
commit 3c9ca8c08a
4 changed files with 8 additions and 15 deletions

View File

@ -1,5 +1,5 @@
#Tue, 09 Apr 2013 21:58:23 -0400
#Tue, 09 Apr 2013 22:12:33 -0400
program.VERSION=2.13
program.BUILDNUM=153
program.BUILDDATE=04/09/2013 09\:58 PM
program.BUILDNUM=155
program.BUILDDATE=04/09/2013 10\:12 PM

View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Tue Apr 09 21:58:22 EDT 2013
build.number=154
#Tue Apr 09 22:12:33 EDT 2013
build.number=156

View File

@ -10,8 +10,9 @@ import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import me.StevenLawson.TotalFreedomMod.TFM_Log;
import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
import me.StevenLawson.TotalFreedomMod.TFM_Util;
import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandMap;
import org.bukkit.command.CommandSender;
@ -29,7 +30,7 @@ public class TFM_CommandLoader
public void scan()
{
CommandMap commandMap = TFM_ServerInterface.getCommandMap();
CommandMap commandMap = TFM_Util.getField(Bukkit.getServer().getPluginManager(), "commandMap");
if (commandMap == null)
{
TFM_Log.severe("Error loading command map.");

View File

@ -10,10 +10,8 @@ import net.minecraft.server.v1_5_R2.BanList;
import net.minecraft.server.v1_5_R2.MinecraftServer;
import net.minecraft.server.v1_5_R2.PlayerList;
import net.minecraft.server.v1_5_R2.PropertyManager;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.command.CommandMap;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerLoginEvent;
@ -121,12 +119,6 @@ public class TFM_ServerInterface
return size;
}
public static CommandMap getCommandMap()
{
CommandMap commandMap = TFM_Util.getField(Bukkit.getServer().getPluginManager(), "commandMap");
return commandMap;
}
public static void handlePlayerLogin(PlayerLoginEvent event)
{
// this should supersede all other onPlayerLogin authentication on the TFM server.