TheDeusGroup/TFM-4.3-Reloaded
1
0
Fork 0
mirror of https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git synced 2024-12-23 07:54:58 +00:00
Code Issues Projects Releases Wiki Activity

Derp.

Browse source
This commit is contained in:
Steven Lawson 2012-09-17 20:13:13 -04:00
parent 3feec18131
commit d786e4e389
3 changed files with 7 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
View file

@ -2,7 +2,6 @@ package me.StevenLawson.TotalFreedomMod.Commands;
import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TFM_Util;
import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -27,8 +26,7 @@ public class Command_ops extends TFM_Command
if (args[0].equalsIgnoreCase("list")) if (args[0].equalsIgnoreCase("list"))
{ {
TFM_Util.playerMsg(sender, "Operators: " + StringUtils.join(server.getOperators(), ", ")); TFM_Util.playerMsg(sender, "Operators: " + TFM_Util.playerListToNames(server.getOperators()));
return true; return true;
} }

3
src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java
View file

@ -4,7 +4,6 @@ import java.util.Set;
import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TFM_Util;
import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -30,7 +29,7 @@ public class Command_whitelist extends TFM_Command
// list // list
if (args[0].equalsIgnoreCase("list")) if (args[0].equalsIgnoreCase("list"))
{ {
TFM_Util.playerMsg(sender, "Whitelisted players: " + StringUtils.join(server.getWhitelistedPlayers(), ", ")); TFM_Util.playerMsg(sender, "Whitelisted players: " + TFM_Util.playerListToNames(server.getWhitelistedPlayers()));
return true; return true;
} }

40
src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
View file

@ -198,12 +198,6 @@ public class TFM_Util
world.setTime(time + 24000 + ticks); world.setTime(time + 24000 + ticks);
} }
@Deprecated
public static void createDefaultConfiguration(String name, TotalFreedomMod tfm, File plugin_file)
{
TFM_Util.createDefaultConfiguration(name, plugin_file);
}
public static void createDefaultConfiguration(String name, File plugin_file) public static void createDefaultConfiguration(String name, File plugin_file)
{ {
TotalFreedomMod tfm = TotalFreedomMod.plugin; TotalFreedomMod tfm = TotalFreedomMod.plugin;
@ -277,12 +271,6 @@ public class TFM_Util
} }
} }
@Deprecated
public static boolean isUserSuperadmin(CommandSender user, TotalFreedomMod tfm)
{
return isUserSuperadmin(user);
}
public static boolean isUserSuperadmin(CommandSender user) public static boolean isUserSuperadmin(CommandSender user)
{ {
try try
@ -325,12 +313,6 @@ public class TFM_Util
return false; return false;
} }
@Deprecated
public static boolean checkPartialSuperadminIP(String user_ip, TotalFreedomMod tfm)
{
return TFM_Util.checkPartialSuperadminIP(user_ip);
}
public static boolean checkPartialSuperadminIP(String user_ip) public static boolean checkPartialSuperadminIP(String user_ip)
{ {
user_ip = user_ip.trim(); user_ip = user_ip.trim();
@ -398,12 +380,6 @@ public class TFM_Util
} }
} }
@Deprecated
public static int wipeEntities(boolean wipe_explosives)
{
return wipeEntities(wipe_explosives, false);
}
public static int wipeEntities(boolean wipe_explosives, boolean wipe_carts) public static int wipeEntities(boolean wipe_explosives, boolean wipe_carts)
{ {
int removed = 0; int removed = 0;
@ -929,20 +905,14 @@ public class TFM_Util
return c.getTime(); return c.getTime();
} }
@Deprecated public static String playerListToNames(Set<OfflinePlayer> players)
public static String arrayToString(Set<OfflinePlayer> set)
{ {
String players = ""; List<String> player_names = new ArrayList<String>();
String delim = ""; for (OfflinePlayer p : players)
for (OfflinePlayer p : set)
{ {
players += delim; player_names.add(p.getName());
players += p.getName();
delim = ", ";
} }
return StringUtils.join(player_names, ", ");
return players;
} }
// I wrote all this before i discovered getTargetBlock >.> - might come in handy some day... // I wrote all this before i discovered getTargetBlock >.> - might come in handy some day...
// public static final double LOOKAT_VIEW_HEIGHT = 1.65; // public static final double LOOKAT_VIEW_HEIGHT = 1.65;