AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-11 13:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert shop to names, next up mysql

Browse Source
This commit is contained in:
ZeroEpoch1969
2020-04-29 16:29:43 -07:00
parent a2a4a8a0b8
commit abbadb55ee
20 changed files with 169 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java
View File

@ -127,6 +127,7 @@ public class Command_ban extends FreedomCommand
for (String ip : ips)
{
ban.addIp(ip);
ban.addIp(FUtil.getFuzzyIp(ip));
}
plugin.bm.addBan(ban);

4
src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
View File

@ -24,8 +24,8 @@ public class Command_consolesay extends FreedomCommand
}
String message = StringUtils.join(args, " ");
FUtil.bcastMsg(String.format("§7[CONSOLE] §c%s §8» §f%s", sender.getName(), StringUtils.join(args, " ")));
plugin.dc.messageChatChannel("[CONSOLE] " + sender.getName() + " \u00BB " + ChatColor.stripColor(message));
FUtil.bcastMsg(String.format("§7[CONSOLE] §c%s §8\u00BB §f%s", sender.getName(), StringUtils.join(args, " ")));
plugin.dc.messageChatChannel("[CONSOLE] " + plugin.dc.deformat(sender.getName()) + " \u00BB " + ChatColor.stripColor(message));
return true;
}
}

1
src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java
View File

@ -33,6 +33,7 @@ public class Command_makeopregion extends FreedomCommand
put(Flags.DESTROY_VEHICLE, StateFlag.State.ALLOW);
put(Flags.ENTITY_ITEM_FRAME_DESTROY, StateFlag.State.ALLOW);
put(Flags.ENTITY_PAINTING_DESTROY, StateFlag.State.ALLOW);
put(net.goldtreeservers.worldguardextraflags.flags.Flags.WORLDEDIT, StateFlag.State.ALLOW);
}};
public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)

2
src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java
View File

@ -41,7 +41,7 @@ public class Command_say extends FreedomCommand
}
FUtil.bcastMsg(String.format("[Server:%s] %s", sender.getName(), message), ChatColor.LIGHT_PURPLE);
plugin.dc.messageChatChannel(String.format("[Server:%s] \u00BB %s", sender.getName(), message));
plugin.dc.messageChatChannel(String.format("[Server:%s] \u00BB %s", plugin.dc.deformat(sender.getName()), message));
return true;
}

2
src/main/java/me/totalfreedom/totalfreedommod/command/Command_setcompass.java
View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME)
@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Set your compass to the specified position.", usage = "/<command> <x> <y> <z>")
public class Command_setcompass extends FreedomCommand
{

2
src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
View File

@ -180,7 +180,7 @@ public class Command_tag extends FreedomCommand
plugin.pl.getPlayer(playerSender).setTag(outputTag);
if (save)
{
save(playerSender, outputTag);
save(playerSender, strippedTag);
}
msg("Tag set to '" + outputTag + ChatColor.GRAY + "'." + (save ? " (Saved)" : ""));

7
src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
View File

@ -44,12 +44,7 @@ public class Command_vanish extends FreedomCommand
}
if (!silent)
{
String beginning = sender.getName() + " is ";
if (admin.getLoginMessage().contains("%name%"))
{
beginning = "";
}
FUtil.bcastMsg(ChatColor.AQUA + beginning + loginMsg);
FUtil.bcastMsg(plugin.rm.craftLoginMessage(playerSender, null));
FUtil.bcastMsg(playerSender.getName() + " joined the game.", ChatColor.YELLOW);
plugin.dc.messageChatChannel("**" + playerSender.getName() + " joined the server" + "**");
}