AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2026-06-05 02:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

yay done

Browse Source
This commit is contained in:
ZeroEpoch1969
2018-12-29 12:41:48 -07:00
parent 7a43f991e3
commit 72db71b3cf
16 changed files with 187 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
+3 -4
View File
@@ -1,6 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.libsdisguise.DisallowedDisguises;
import me.totalfreedom.disguise.DisguiseBlocker;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.command.Command;
@@ -21,8 +21,7 @@ public class Command_disguisetoggle extends FreedomCommand
return true;
}
FUtil.adminAction(sender.getName(), (DisallowedDisguises.disabled ? "Enabling" : "Disabling")
+ " disguises", false);
FUtil.adminAction(sender.getName(), (DisguiseBlocker.enabled ? "Disabling" : "Enabling") + " disguises", false);
if (plugin.ldb.isDisguisesEnabled())
{
@@ -34,7 +33,7 @@ public class Command_disguisetoggle extends FreedomCommand
plugin.ldb.setDisguisesEnabled(true);
}
msg("Disguises are now " + (!DisallowedDisguises.disabled ? "enabled." : "disabled."));
msg("Disguises are now " + (DisguiseBlocker.enabled ? "enabled." : "disabled."));
return true;
}
src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java
+2 -2
View File
@@ -14,12 +14,12 @@ public class Command_setlimit extends FreedomCommand
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
int amount = 100000;
int amount = plugin.web.getDefaultLimit();
if (args.length > 0)
{
try
{
amount = Math.max(1, Math.min(200000, Integer.parseInt(args[0])));
amount = Math.max(1, Math.min(plugin.web.getMaxLimit(), Integer.parseInt(args[0])));
}
catch (NumberFormatException ex)
{
src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
+10 -8
View File
@@ -151,16 +151,18 @@ public class Command_tag extends FreedomCommand
});
final String outputTag = FUtil.colorize(strippedTag);
int tagLimit = (plugin.al.isAdmin(sender) ? 30 : 20);
final String rawTag = ChatColor.stripColor(strippedTag).toLowerCase();
if (rawTag.length() > tagLimit)
{
msg("That tag is too long (Max is " + String.valueOf(tagLimit) + " characters).");
return true;
}
if (!plugin.al.isAdmin(sender))
{
final String rawTag = ChatColor.stripColor(outputTag).toLowerCase();
if (rawTag.length() > 20)
{
msg("That tag is too long (Max is 20 characters).");
return true;
}
for (String word : FORBIDDEN_WORDS)
{
if (rawTag.contains(word))
src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java
+10 -8
View File
@@ -31,16 +31,18 @@ public class Command_tagnyan extends FreedomCommand
String tagStr = tag.toString();
int tagLimit = (plugin.al.isAdmin(sender) ? 30 : 20);
final String rawTag = ChatColor.stripColor(tagStr).toLowerCase();
if (rawTag.length() > tagLimit)
{
msg("That tag is too long (Max is " + String.valueOf(tagLimit) + " characters).");
return true;
}
if (!plugin.al.isAdmin(sender))
{
final String rawTag = ChatColor.stripColor(tagStr).toLowerCase();
if (rawTag.length() > 20)
{
msg("That tag is too long (Max is 20 characters).");
return true;
}
for (String word : Command_tag.FORBIDDEN_WORDS)
{
if (rawTag.contains(word))
src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java
+12 -5
View File
@@ -1,6 +1,6 @@
package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.libsdisguise.DisallowedDisguises;
import me.totalfreedom.disguise.DisguiseBlocker;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.command.Command;
@@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Undisguise all players on the server", usage = "/<command>", aliases = "uall")
@CommandParameters(description = "Undisguise all players on the server", usage = "/<command> [-a]", aliases = "uall")
public class Command_undisguiseall extends FreedomCommand
{
@@ -21,15 +21,22 @@ public class Command_undisguiseall extends FreedomCommand
return true;
}
if (DisallowedDisguises.disabled)
if (!DisguiseBlocker.enabled)
{
msg("Disguises are not enabled.");
return true;
}
FUtil.adminAction(sender.getName(), "Undisguising all non-admins", true);
boolean admins = false;
plugin.ldb.undisguiseAll(false);
if (args.length > 0 && args[0].equalsIgnoreCase("-a"))
{
admins = true;
}
FUtil.adminAction(sender.getName(), "Undisguising all " + (admins ? "players" : "non-admins"), true);
plugin.ldb.undisguiseAll(admins);
return true;
}
src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class Command_vanish extends FreedomCommand
}
if (!silent)
{
FUtil.bcastMsg(ChatColor.AQUA + playerSender.getName() + " is " + loginMsg);
FUtil.bcastMsg(ChatColor.AQUA + (loginMsg.contains("%name%") ? "" : playerSender.getName() + " is ") + FUtil.colorize(loginMsg).replace("%name%", playerSender.getName()));
FUtil.bcastMsg(playerSender.getName() + " joined the game", ChatColor.YELLOW);
}
if (admin.getTag() != null)