AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-30 02:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't need getCommandMap() here.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appinfo.properties
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.VERSION=2.13
program.BUILDNUM=153 program.BUILDNUM=155
program.BUILDDATE=04/09/2013 09\:58 PM program.BUILDDATE=04/09/2013 10\:12 PM

4
buildnumber.properties
View File

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

5
src/me/StevenLawson/TotalFreedomMod/Commands/TFM_CommandLoader.java
View File

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

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