Compare commits

...

20 Commits
v2.14 ... v2.16

Author SHA1 Message Date
3b7a8d4d88 Incremented version number 2013-05-17 20:05:52 +02:00
d016e1ff08 Fixed stuff with Wilee's and Wild's changes 2013-05-17 20:03:16 +02:00
ab9650dc54 Merge pull request #13 from Wilee999/master
xxWileexx: Add /purgeall, minor changes.
2013-05-16 11:54:12 -07:00
d3139dd39f hopefully this works 2013-05-16 11:49:41 -07:00
ba834b6b92 g 2013-05-16 11:45:21 -07:00
ccd4237491 Merge pull request #15 from Wild1145/patch-3
Added /setl to set the amount of world edit blocks that can be used
2013-05-16 11:35:43 -07:00
ff51bb1980 Merge pull request #16 from Wild1145/patch-4
Added warning in MOTD if in adminmode=true
2013-05-16 11:31:52 -07:00
d2457adf68 Create Command_cmdlist.java 2013-05-16 12:31:22 -06:00
aea65815a8 removed /denick from /purgeall 2013-05-16 12:29:06 -06:00
6abd2491f1 Removed /denick from /spurgeall 2013-05-16 12:28:28 -06:00
31b5c99007 Added broadcast to /spurgeall 2013-05-16 12:19:47 -06:00
4aebf33006 Added a broadcast to /purgeall 2013-05-16 12:18:39 -06:00
e29a820398 Added /spurgeall 2013-05-16 00:57:26 -07:00
fabbc78d22 Replaced /clearall with /purgeall, this cleans more! 2013-05-15 23:59:08 -07:00
a8b4f1d950 Removed /cmdlist (useless) 2013-05-15 20:56:18 -07:00
b7c9f4e02d Added warning in MOTD if in adminmode=true
I think this would save people connecting and spamming logs if in adminmode!
2013-05-15 23:12:46 +02:00
ba9289e1a3 Added /setl to set the amount of world edit blocks that can be used 2013-05-15 23:05:20 +02:00
b1202c7871 hopefully this fixed /invis 2013-05-15 12:03:45 -06:00
e82e88f48f Added /invis, incremented version number to reflect latest changes 2013-05-15 15:23:35 +02:00
36747cb986 Added /tban, colors for /rawsay, minor changes 2013-05-15 14:56:23 +02:00
13 changed files with 171 additions and 33 deletions

View File

@ -1,5 +1,5 @@
#Thu, 09 May 2013 15:32:18 +0200
#Wed, 15 May 2013 15:22:48 +0200
program.VERSION=2.14
program.BUILDNUM=182
program.BUILDDATE=05/09/2013 03\:32 PM
program.VERSION=2.16
program.BUILDNUM=190
program.BUILDDATE=05/15/2013 03\:22 PM

View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Thu May 09 15:32:18 CEST 2013
build.number=183
#Wed May 15 15:22:48 CEST 2013
build.number=191

View File

@ -1,4 +1,4 @@
# TotalFreedomMod v2.13 Configuration
# TotalFreedomMod v2.16 Configuration
# by Madgeek1450 and DarthSalamon
# Block placement prevention:

View File

@ -0,0 +1,65 @@
package me.StevenLawson.TotalFreedomMod.Commands;
import java.util.ArrayList;
import java.util.List;
import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
import me.StevenLawson.TotalFreedomMod.TFM_Util;
import org.apache.commons.lang.StringUtils;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
@CommandParameters(description = "Shows (optionally smites) invisisible players", usage = "/<command> (smite)")
public class Command_invis extends TFM_Command {
@Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
boolean smite = false;
if (args.length >= 1)
{
if (args[0].equalsIgnoreCase("smite"))
{
smite = true;
}
else
{
return false;
}
}
List<String> players = new ArrayList<String>();
int smites = 0;
for (Player p : server.getOnlinePlayers())
{
if (p.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
players.add(p.getName());
if (smite && !TFM_SuperadminList.isUserSuperadmin(p))
{
server.dispatchCommand(sender, "smite " + p.getName());
smites++;
}
}
}
if (players.isEmpty()) {
TFM_Util.playerMsg(sender, "There are no invisible players");
return true;
}
if (smite)
{
TFM_Util.playerMsg(sender, "Smitten " + smites + " players");
}
else
{
TFM_Util.playerMsg(sender, "Invisble players (" + players.size() + "): " + StringUtils.join(players, ", "));
}
return true;
}
}

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = true)
@CommandParameters(description = "Manage permanently banned players and IPs.", usage = "/<command> <list | reload>")
public class Command_permban extends TFM_Command
{

View File

@ -8,7 +8,7 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH)
@CommandParameters(description = "Enable / disable plugins.", usage = "/<command> < <enable | disable> <pluginname> | list >")
@CommandParameters(description = "Enable / disable plugins.", usage = "/<command> < <enable | disable> <pluginname> | list >", aliases = "plc")
public class Command_plugincontrol extends TFM_Command
{
private enum CommandMode

View File

@ -5,8 +5,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
@CommandParameters(description = "Removes all entities, nicks and disguises.", usage = "/<command>")
public class Command_clearall extends TFM_Command
@CommandParameters(description = "Superadmin command - Purge everything! (except for bans).", usage = "/<command>")
public class Command_purgeall extends TFM_Command
{
@Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
@ -14,6 +14,13 @@ public class Command_clearall extends TFM_Command
server.dispatchCommand(sender, "rd");
server.dispatchCommand(sender, "potion clearall");
server.dispatchCommand(sender, "uall");
server.dispatchCommand(sender, "mute purge");
server.dispatchCommand(sender, "fr purge");
server.dispatchCommand(sender, "mp");
server.dispatchCommand(sender, "blockcmd");
server.dispatchCommand(sender, "halt purge");
//If I'm missing any, lemme know. Or just add it yourself.
return true;
}

View File

@ -2,12 +2,13 @@ package me.StevenLawson.TotalFreedomMod.Commands;
import me.StevenLawson.TotalFreedomMod.TFM_Util;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
@CommandParameters(description = "Broadcasts the given message with no extra formatting.", usage = "/<command> <message>")
@CommandParameters(description = "Broadcasts the given message. Supports colors.", usage = "/<command> <message>")
public class Command_rawsay extends TFM_Command
{
@Override
@ -15,7 +16,7 @@ public class Command_rawsay extends TFM_Command
{
if (args.length > 0)
{
TFM_Util.bcastMsg(StringUtils.join(args, " "));
TFM_Util.bcastMsg(ChatColor.translateAlternateColorCodes('&', StringUtils.join(args, " ")));
}
return true;

View File

@ -0,0 +1,20 @@
package me.StevenLawson.TotalFreedomMod.Commands;
import me.StevenLawson.TotalFreedomMod.TFM_Util;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
@CommandParameters(description = "Sets everyone World Edit Limit to 500.", usage = "/<command>")
public class Command_setl extends TFM_Command
{
@Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
server.dispatchCommand(sender, "wildcard gcmd ? /limit 500");
TFM_Util.adminAction(sender.getName(), "Setting all online players block limit to 500.", true);
return true;
}
}

View File

@ -0,0 +1,41 @@
package me.StevenLawson.TotalFreedomMod.Commands;
import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
import me.StevenLawson.TotalFreedomMod.TFM_Util;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> <partialname>", aliases = "nope")
public class Command_tban extends TFM_Command {
@Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (args.length != 1)
{
return false;
}
Player p;
try
{
p = getPlayer(args[0]);
}
catch (CantFindPlayerException ex)
{
playerMsg(ex.getMessage(), ChatColor.RED);
return true;
}
TFM_Util.adminAction(sender.getName(), "NOPE: " + p.getName(), true);
TFM_ServerInterface.banUsername(p.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes",
sender.getName(), TFM_Util.parseDateOffset("5m"));
p.kickPlayer(ChatColor.RED + "NOPE!\nYou have been temporarily banned for five minutes.");
return true;
}
}

View File

@ -727,5 +727,9 @@ public class TFM_PlayerListener implements Listener
{
event.setMotd(ChatColor.RED + "You are banned!");
}
if (TotalFreedomMod.adminOnlyMode)
{
event.setMotd(ChatColor.RED + "Server in AdminMode!");
}
}
}

View File

@ -1,6 +1,6 @@
name: TotalFreedomMod
main: me.StevenLawson.TotalFreedomMod.TotalFreedomMod
version: 2.14
version: 2.16
description: Plugin for the Total Freedom server.
authors: [StevenLawson / Madgeek1450, JeromSar / DarthSalamon]