TheDeusGroup/TFM-4.3-Reloaded
1
0
Fork 0
mirror of https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git synced 2024-06-01 04:21:17 +00:00
Code Issues 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
parent 074630f720 4e3c9a6b9e
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>")
public class Command_tag extends TFM_Command
{
public static final List<String> FORBIDDEN_WORDS = Arrays.asList(new String[]{"admin", "owner", "moderator", "developer"});
public static final List<String> FORBIDDEN_WORDS = Arrays.asList(new String[]
{
"admin", "owner", "moderator", "developer"
});
@Override
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.");
return true;
}
if (TFM_Util.isStopCommand(args[0]))
{
TFM_PlayerData.getPlayerData(sender_p).setTag(null);
@ -111,8 +113,7 @@ public class Command_tag extends TFM_Command
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;
}
}

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));
return null;
}
public static final List<ChatColor> COLOR_POOL = Arrays.asList(
ChatColor.DARK_BLUE,
ChatColor.DARK_GREEN,