AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-07-05 01:50:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mg_incomplete

Browse Source
This commit is contained in:
StevenLawson 2013-08-12 10:05:01 -04:00
commit 41ed416a51
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java
View File

@ -14,9 +14,11 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Sets yourself a prefix", usage = "/<command> <<prefix> | off | clear <player> | clearall>") @CommandParameters(description = "Sets yourself a prefix", usage = "/<command> <<prefix> | off | clear <player> | clearall>")
public class Command_tag extends TFM_Command public class Command_tag extends TFM_Command
{ {
public static final List<String> FORBIDDEN_WORDS = Arrays.asList(new String[]
public static final List<String> FORBIDDEN_WORDS = Arrays.asList(new String[]{"admin", "owner", "moderator", "developer"}); {
"admin", "owner", "moderator", "developer"
});
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
@ -52,7 +54,7 @@ public class Command_tag extends TFM_Command
playerMsg("This can only be used by players."); playerMsg("This can only be used by players.");
return true; return true;
} }
if (TFM_Util.isStopCommand(args[0])) if (TFM_Util.isStopCommand(args[0]))
{ {
TFM_PlayerData.getPlayerData(sender_p).setTag(null); TFM_PlayerData.getPlayerData(sender_p).setTag(null);
@ -111,8 +113,7 @@ public class Command_tag extends TFM_Command
return false; return false;
} }
return false; return false;
} }
} }

1
src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java
View File

@ -522,5 +522,4 @@ public class TFM_PlayerData
{ {
return this.tag; return this.tag;
} }
} }

1
src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
View File

@ -962,7 +962,6 @@ public class TFM_Util
while (checkClass.getSuperclass() != Object.class && ((checkClass = checkClass.getSuperclass()) != null)); while (checkClass.getSuperclass() != Object.class && ((checkClass = checkClass.getSuperclass()) != null));
return null; return null;
} }
public static final List<ChatColor> COLOR_POOL = Arrays.asList( public static final List<ChatColor> COLOR_POOL = Arrays.asList(
ChatColor.DARK_BLUE, ChatColor.DARK_BLUE,
ChatColor.DARK_GREEN, ChatColor.DARK_GREEN,