diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java index c4f273586..c4c207790 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java @@ -18,7 +18,7 @@ public class Commandafk extends EssentialsCommand { @Override public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { - if (args.length > 0 && user.isAuthorized("essentials.afk.others")) { + if (args.length > 0 && getTFMHandler().isStaff(user)) { User afkUser = user; // if no player found, but message specified, set command executor to target user String message; try { @@ -91,7 +91,7 @@ public class Commandafk extends EssentialsCommand { @Override protected List getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) { - if (args.length == 1 && sender.isAuthorized("essentials.afk.others", ess)) { + if (args.length == 1 && getTFMHandler().isStaff(sender.getPlayer())) { return getPlayers(server, sender); } else { return Collections.emptyList(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java b/Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java index 478e72092..092a0332d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandenderchest.java @@ -14,7 +14,7 @@ public class Commandenderchest extends EssentialsCommand { @Override protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { User target = user; - if (args.length > 0 && user.isAuthorized("essentials.enderchest.others")) { + if (args.length > 0 && getTFMHandler().isStaff(user)) { target = getPlayer(server, user, args, 0); } @@ -25,7 +25,7 @@ public class Commandenderchest extends EssentialsCommand { @Override protected List getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) { - if (args.length == 1 && user.isAuthorized("essentials.enderchest.others")) { + if (args.length == 1 && getTFMHandler().isStaff(user)) { return getPlayers(server, user); } else { return Collections.emptyList(); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java index 55284921d..bb8368d02 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java @@ -24,7 +24,7 @@ public class Commandmsg extends EssentialsLoopCommand { } String message = getFinalArg(args, 1); - final boolean canWildcard = sender.isAuthorized("essentials.msg.multiple", ess); + boolean canWildcard = getTFMHandler().isStaff(sender.getPlayer()); if (sender.isPlayer()) { final User user = ess.getUser(sender.getPlayer()); if (user.isMuted()) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java index 9580b8883..d70a9c9ff 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java @@ -27,9 +27,9 @@ public class Commandseen extends EssentialsCommand { @Override protected void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { - final boolean showBan = sender.isAuthorized("essentials.seen.banreason", ess); - final boolean showIp = sender.isAuthorized("essentials.seen.ip", ess); - final boolean showLocation = sender.isAuthorized("essentials.seen.location", ess); + final boolean showBan = getTFMHandler().isStaff(sender.getPlayer()); + final boolean showIp = getTFMHandler().isStaff(sender.getPlayer()); + final boolean showLocation = getTFMHandler().isStaff(sender.getPlayer()); if (args.length < 1) { throw new NotEnoughArgumentsException(); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java index 613ea61b9..651427adf 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java @@ -39,13 +39,15 @@ public class Commandwhois extends EssentialsCommand { sender.sendMessage(tl("whoisHealth", user.getBase().getHealth())); sender.sendMessage(tl("whoisHunger", user.getBase().getFoodLevel(), user.getBase().getSaturation())); sender.sendMessage(tl("whoisExp", SetExpFix.getTotalExperience(user.getBase()), user.getBase().getLevel())); - sender.sendMessage(tl("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ())); - final long playtimeMs = System.currentTimeMillis() - (user.getBase().getStatistic(PLAY_ONE_TICK) * 50); + if (!sender.isPlayer() || getTFMHandler().isStaff(sender.getPlayer())) { + sender.sendMessage(tl("whoisLocation", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ())); + } + long playtimeMs = System.currentTimeMillis() - (user.getBase().getStatistic(PLAY_ONE_TICK) * 50); sender.sendMessage(tl("whoisPlaytime", DateUtil.formatDateDiff(playtimeMs))); if (!ess.getSettings().isEcoDisabled()) { sender.sendMessage(tl("whoisMoney", NumberUtil.displayCurrency(user.getMoney(), ess))); } - if (!sender.isPlayer() || ess.getUser(sender.getPlayer()).isAuthorized("essentials.whois.ip")) { + if (!sender.isPlayer() || getTFMHandler().isStaff(sender.getPlayer())) { sender.sendMessage(tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString())); } final String location = user.getGeoLocation(); diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java index 5af932a6d..1834d72af 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java +++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java @@ -2,6 +2,7 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.IEssentialsModule; +import com.earth2me.essentials.TFMHandler; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.FormatUtil; @@ -42,11 +43,17 @@ public abstract class EssentialsCommand implements IEssentialsCommand { private final transient String name; protected transient IEssentials ess; protected transient IEssentialsModule module; + protected static final TFMHandler tfmHandler = new TFMHandler(); protected EssentialsCommand(final String name) { this.name = name; } + public static TFMHandler getTFMHandler() + { + return tfmHandler; + } + public static String getFinalArg(final String[] args, final int start) { final StringBuilder bldr = new StringBuilder(); for (int i = start; i < args.length; i++) { diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java b/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java index 29934d7e8..59a587f6c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java +++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsLoopCommand.java @@ -18,15 +18,17 @@ public abstract class EssentialsLoopCommand extends EssentialsCommand { super(command); } - protected void loopOfflinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final String[] commandArgs) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { + protected void loopOfflinePlayers(final Server server, final CommandSource sender, final boolean multipleStringMatches, boolean matchWildcards, final String searchTerm, final String[] commandArgs) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { loopOfflinePlayersConsumer(server, sender, multipleStringMatches, matchWildcards, searchTerm, user -> updatePlayer(server, sender, user, commandArgs)); } - protected void loopOfflinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, final boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { + protected void loopOfflinePlayersConsumer(final Server server, final CommandSource sender, final boolean multipleStringMatches, boolean matchWildcards, final String searchTerm, final UserConsumer userConsumer) throws PlayerNotFoundException, NotEnoughArgumentsException, PlayerExemptException, ChargeException, MaxMoneyException { if (searchTerm.isEmpty()) { throw new PlayerNotFoundException(); } + matchWildcards = getTFMHandler().isStaff(sender.getPlayer()); + final UUID uuid = StringUtil.toUUID(searchTerm); if (uuid != null) { final User matchedUser = ess.getUser(uuid); diff --git a/Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java b/Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java index 6197bad81..476770d47 100644 --- a/Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java +++ b/Essentials/src/com/earth2me/essentials/commands/EssentialsToggleCommand.java @@ -20,12 +20,12 @@ public abstract class EssentialsToggleCommand extends EssentialsCommand { protected void handleToggleWithArgs(final Server server, final User user, final String[] args) throws Exception { if (args.length == 1) { final Boolean toggle = matchToggleArgument(args[0]); - if (toggle == null && user.isAuthorized(othersPermission)) { + if (toggle == null && getTFMHandler().isStaff(user)) { toggleOtherPlayers(server, user.getSource(), args); } else { togglePlayer(user.getSource(), user, toggle); } - } else if (args.length == 2 && user.isAuthorized(othersPermission)) { + } else if (args.length == 2 && getTFMHandler().isStaff(user)) { toggleOtherPlayers(server, user.getSource(), args); } else { togglePlayer(user.getSource(), user, null); @@ -73,12 +73,12 @@ public abstract class EssentialsToggleCommand extends EssentialsCommand { @Override protected List getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) { if (args.length == 1) { - if (user.isAuthorized(othersPermission)) { + if (getTFMHandler().isStaff(user)) { return getPlayers(server, user); } else { return Lists.newArrayList("enable", "disable"); } - } else if (args.length == 2 && user.isAuthorized(othersPermission)) { + } else if (args.length == 2 && getTFMHandler().isStaff(user)) { return Lists.newArrayList("enable", "disable"); } else { return Collections.emptyList(); diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 0608bd842..c58e09f11 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -13,10 +13,10 @@ commands: description: Marks you as away-from-keyboard. usage: / [player/message...] aliases: [eafk,away,eaway] - antioch: - description: 'A little surprise for operators.' - usage: / [message] - aliases: [eantioch,grenade,egrenade,tnt,etnt] +# antioch: +# description: 'A little surprise for operators.' +# usage: / [message] +# aliases: [eantioch,grenade,egrenade,tnt,etnt] anvil: description: Opens up an Anvil. usage: / @@ -25,10 +25,10 @@ commands: description: Teleports you to your location prior to tp/spawn/warp. usage: / [player] aliases: [eback,return,ereturn] - backup: - description: Runs the backup if configured. - usage: / - aliases: [ebackup] +# backup: +# description: Runs the backup if configured. +# usage: / +# aliases: [ebackup] balance: description: States the current balance of a player. usage: / [player] @@ -37,14 +37,14 @@ commands: description: Gets the top balance values. usage: / aliases: [ebalancetop,baltop,ebaltop] - ban: - description: Bans a player. - usage: / [reason] - aliases: [eban] - banip: - description: Bans an IP address. - usage: /
- aliases: [ebanip] +# ban: +# description: Bans a player. +# usage: / [reason] +# aliases: [eban] +# banip: +# description: Bans an IP address. +# usage: /
+# aliases: [ebanip] beezooka: description: Throw an exploding bee at your opponent. usage: / @@ -57,14 +57,14 @@ commands: description: Breaks the block you are looking at. usage: / aliases: [ebreak] - broadcast: - description: Broadcasts a message to the entire server. - usage: / - aliases: [bc,ebc,bcast,ebcast,ebroadcast,shout,eshout] - broadcastworld: - description: Broadcasts a message to a world. - usage: / - aliases: [bcw,ebcw,bcastw,ebcastw,ebroadcastworld,shoutworld,eshoutworld] +# broadcast: +# description: Broadcasts a message to the entire server. +# usage: / +# aliases: [bc,ebc,bcast,ebcast,ebroadcast,shout,eshout] +# broadcastworld: +# description: Broadcasts a message to a world. +# usage: / +# aliases: [bcw,ebcw,bcastw,ebcastw,ebroadcastworld,shoutworld,eshoutworld] bigtree: description: Spawn a big tree where you are looking. usage: / @@ -77,14 +77,14 @@ commands: description: Opens up a cartography table. usage: / aliases: [ecartographytable, carttable, ecarttable] - clearinventory: - description: Clear all items in your inventory. - usage: / [player|*] [item[:]|*|**] [amount] - aliases: [ci,eci,clean,eclean,clear,eclear,clearinvent,eclearinvent,eclearinventory] - clearinventoryconfirmtoggle: - description: Toggles whether you are prompted to confirm inventory clears. - usage: / - aliases: [eclearinventoryconfirmtoggle, clearinventoryconfirmoff, eclearinventoryconfirmoff, clearconfirmoff, eclearconfirmoff, clearconfirmon, eclearconfirmon, clearconfirm, eclearconfirm] +# clearinventory: +# description: Clear all items in your inventory. +# usage: / [player|*] [item[:]|*|**] [amount] +# aliases: [ci,eci,clean,eclean,clear,eclear,clearinvent,eclearinvent,eclearinventory] +# clearinventoryconfirmtoggle: +# description: Toggles whether you are prompted to confirm inventory clears. +# usage: / +# aliases: [eclearinventoryconfirmtoggle, clearinventoryconfirmoff, eclearinventoryconfirmoff, clearconfirmoff, eclearconfirmoff, clearconfirmon, eclearconfirmon, clearconfirm, eclearconfirm] condense: description: Condenses items into a more compact blocks. usage: / [||hand|inventory] @@ -104,10 +104,10 @@ commands: description: Removes a home. usage: / [player:] aliases: [edelhome,remhome,eremhome,rmhome,ermhome] - deljail: - description: Removes a jail. - usage: / - aliases: [edeljail,remjail,eremjail,rmjail,ermjail] +# deljail: +# description: Removes a jail. +# usage: / +# aliases: [edeljail,remjail,eremjail,rmjail,ermjail] delkit: description: Deletes the specified kit. usage: / @@ -128,18 +128,18 @@ commands: description: Manages the server economy. usage: / aliases: [eeco,economy,eeconomy] - enchant: - description: Enchants the item the user is holding. - usage: / [level] - aliases: [eenchant,enchantment,eenchantment] +# enchant: +# description: Enchants the item the user is holding. +# usage: / [level] +# aliases: [eenchant,enchantment,eenchantment] enderchest: description: Lets you see inside an enderchest. usage: / [player] aliases: [echest,eechest,eenderchest,endersee,eendersee,ec,eec] - essentials: - description: Reloads essentials. - usage: / - aliases: [eessentials, ess, eess, essversion] +# essentials: +# description: Reloads essentials. +# usage: / +# aliases: [eessentials, ess, eess, essversion] exp: description: Give, set, reset, or look at a players experience. usage: / [reset|show|set|give] [playername [amount]] @@ -156,18 +156,18 @@ commands: description: Take off, and soar! usage: / [player] [on|off] aliases: [efly] - fireball: - description: Throw a fireball or other assorted projectiles. - usage: / [fireball|small|large|arrow|skull|egg|snowball|expbottle|dragon|splashpotion|lingeringpotion|trident] [speed] - aliases: [efireball,fireentity,efireentity,fireskull,efireskull] +# fireball: +# description: Throw a fireball or other assorted projectiles. +# usage: / [fireball|small|large|arrow|skull|egg|snowball|expbottle|dragon|splashpotion|lingeringpotion|trident] [speed] +# aliases: [efireball,fireentity,efireentity,fireskull,efireskull] firework: description: Allows you to modify a stack of fireworks. usage: / <|power [amount]|clear|fire [amount]> aliases: [efirework] - gamemode: - description: Change player gamemode. - usage: / [player] - aliases: [adventure,eadventure,adventuremode,eadventuremode,creative,ecreative,eecreative,creativemode,ecreativemode,egamemode,gm,egm,gma,egma,gmc,egmc,gms,egms,gmt,egmt,survival,esurvival,survivalmode,esurvivalmode,gmsp,sp,egmsp,spec,spectator] +# gamemode: +# description: Change player gamemode. +# usage: / [player] +# aliases: [adventure,eadventure,adventuremode,eadventuremode,creative,ecreative,eecreative,creativemode,ecreativemode,egamemode,gm,egm,gma,egma,gmc,egmc,gms,egms,gmt,egmt,survival,esurvival,survivalmode,esurvivalmode,gmsp,sp,egmsp,spec,spectator] gc: description: Reports memory, uptime and tick info. usage: / [all] @@ -200,10 +200,10 @@ commands: description: Views a list of available commands. usage: / [search term] [page] aliases: [ehelp] - helpop: - description: Message online admins. - usage: / - aliases: [ac,eac,amsg,eamsg,ehelpop] +# helpop: +# description: Message online admins. +# usage: / +# aliases: [ac,eac,amsg,eamsg,ehelpop] home: description: Teleport to your home. usage: / [player:][name] @@ -236,26 +236,26 @@ commands: description: Names an item. usage: / [name] aliases: [iname, einame, eitemname, itemrename, irename, eitemrename, eirename] - jails: - description: List all jails. - usage: / - aliases: [ejails] +# jails: +# description: List all jails. +# usage: / +# aliases: [ejails] jump: description: Jumps to the nearest block in the line of sight. usage: / aliases: [j,ej,ejump,jumpto,ejumpto] - kick: - description: Kicks a specified player with a reason. - usage: / [reason] - aliases: [ekick] - kickall: - description: Kicks all players off the server except the issuer. - usage: / [reason] - aliases: [ekickall] - kill: - description: Kills specified player. - usage: / - aliases: [ekill] +# kick: +# description: Kicks a specified player with a reason. +# usage: / [reason] +# aliases: [ekick] +# kickall: +# description: Kicks all players off the server except the issuer. +# usage: / [reason] +# aliases: [ekickall] +# kill: +# description: Kills specified player. +# usage: / +# aliases: [ekill] kit: description: Obtains the specified kit or views all available kits. usage: / [kit] [player] @@ -264,14 +264,14 @@ commands: description: Throw an exploding kitten at your opponent. usage: / aliases: [ekittycannon] - lightning: - description: The power of Thor. Strike at cursor or player. - usage: / [player] [power] - aliases: [elightning,shock,eshock,smite,esmite,strike,estrike,thor,ethor] - list: - description: List all online players. - usage: / [group] - aliases: [elist,online,eonline,playerlist,eplayerlist,plist,eplist,who,ewho] +# lightning: +# description: The power of Thor. Strike at cursor or player. +# usage: / [player] [power] +# aliases: [elightning,shock,eshock,smite,esmite,strike,estrike,thor,ethor] +# list: +# description: List all online players. +# usage: / [group] +# aliases: [elist,online,eonline,playerlist,eplayerlist,plist,eplist,who,ewho] loom: description: Opens up a loom. usage: / @@ -300,10 +300,10 @@ commands: description: Blocks receiving all private messages. usage: / [player] [on|off] aliases: [emsgtoggle] - mute: - description: Mutes or unmutes a player. - usage: / [datediff] [reason] - aliases: [emute,silence,esilence] +# mute: +# description: Mutes or unmutes a player. +# usage: / [datediff] [reason] +# aliases: [emute,silence,esilence] near: description: Lists the players near by or around a player. usage: / [playername] [radius] @@ -312,14 +312,14 @@ commands: description: Change your nickname or that of another player. usage: / [player] aliases: [enick,nickname,enickname] - nuke: - description: May death rain upon them. - usage: / [player] - aliases: [enuke] - tpoffline: - description: Teleport to a player's last known logout location - usage: / - aliases: [otp, offlinetp, tpoff, tpoffline] +# nuke: +# description: May death rain upon them. +# usage: / [player] +# aliases: [enuke] +# tpoffline: +# description: Teleport to a player's last known logout location +# usage: / +# aliases: [otp, offlinetp, tpoff, tpoffline] pay: description: Pays another player from your balance. usage: / @@ -336,18 +336,18 @@ commands: description: Pong! usage: / aliases: [echo,eecho,eping,pong,epong] - potion: - description: Adds custom potion effects to a potion. - usage: / power: duration:> - aliases: [epotion,elixer,eelixer] - powertool: - description: Assigns a command to the item in hand. - usage: / [l:|a:|r:|c:|d:][command] [arguments] - {player} can be replaced by name of a clicked player. - aliases: [epowertool,pt,ept] - powertooltoggle: - description: Enables or disables all current powertools. - usage: / - aliases: [epowertooltoggle,ptt,eptt,pttoggle,epttoggle] +# potion: +# description: Adds custom potion effects to a potion. +# usage: / power: duration:> +# aliases: [epotion,elixer,eelixer] +# powertool: +# description: Assigns a command to the item in hand. +# usage: / [l:|a:|r:|c:|d:][command] [arguments] - {player} can be replaced by name of a clicked player. +# aliases: [epowertool,pt,ept] +# powertooltoggle: +# description: Enables or disables all current powertools. +# usage: / +# aliases: [epowertooltoggle,ptt,eptt,pttoggle,epttoggle] ptime: description: Adjust player's client time. Add @ prefix to fix. usage: / [list|reset|day|night|dawn|17:30|4pm|4000ticks] [player|*] @@ -400,14 +400,14 @@ commands: description: Set your home to your current location. usage: / [[player:]name] aliases: [esethome,createhome,ecreatehome] - setjail: - description: Creates a jail where you specified named [jailname]. - usage: / - aliases: [esetjail,createjail,ecreatejail] - settpr: - description: Set the random teleport location and parameters. - usage: / [center|minrange|maxrange] [value] - aliases: [esettpr, settprandom, esettprandom] +# setjail: +# description: Creates a jail where you specified named [jailname]. +# usage: / +# aliases: [esetjail,createjail,ecreatejail] +# settpr: +# description: Set the random teleport location and parameters. +# usage: / [center|minrange|maxrange] [value] +# aliases: [esettpr, settprandom, esettprandom] setwarp: description: Creates a new warp. usage: / @@ -440,10 +440,10 @@ commands: description: Change the mob type of a spawner. usage: / [delay] aliases: [changems,echangems,espawner,mobspawner,emobspawner] - spawnmob: - description: Spawns a mob. - usage: / [:data][,[:data]] [amount] [player] - aliases: [mob,emob,spawnentity,espawnentity,espawnmob] +# spawnmob: +# description: Spawns a mob. +# usage: / [:data][,[:data]] [amount] [player] +# aliases: [mob,emob,spawnentity,espawnentity,espawnmob] speed: description: Change your speed limits. usage: / [type] [player] @@ -452,34 +452,34 @@ commands: description: Opens up a stonecutter. usage: / aliases: [estonecutter] - sudo: - description: Make another user perform a command. - usage: / - aliases: [esudo] +# sudo: +# description: Make another user perform a command. +# usage: / +# aliases: [esudo] suicide: description: Causes you to perish. usage: / aliases: [esuicide] - tempban: - description: Temporary ban a user. - usage: / - aliases: [etempban] - tempbanip: - description: Temporarily ban an IP Address. - usage: / - aliases: [etempbanip] - thunder: - description: Enable/disable thunder. - usage: / [duration] - aliases: [ethunder] - time: - description: Display/Change the world time. Defaults to current world. - usage: / [set|add] [day|night|dawn|17:30|4pm|4000ticks] [worldname|all] - aliases: [day,eday,night,enight,etime] - togglejail: - description: Jails/Unjails a player, TPs them to the jail specified. - usage: / [datediff] - aliases: [jail,ejail,tjail,etjail,etogglejail,unjail,eunjail] +# tempban: +# description: Temporary ban a user. +# usage: / +# aliases: [etempban] +# tempbanip: +# description: Temporarily ban an IP Address. +# usage: / +# aliases: [etempbanip] +# thunder: +# description: Enable/disable thunder. +# usage: / [duration] +# aliases: [ethunder] +# time: +# description: Display/Change the world time. Defaults to current world. +# usage: / [set|add] [day|night|dawn|17:30|4pm|4000ticks] [worldname|all] +# aliases: [day,eday,night,enight,etime] +# togglejail: +# description: Jails/Unjails a player, TPs them to the jail specified. +# usage: / [datediff] +# aliases: [jail,ejail,tjail,etjail,etogglejail,unjail,eunjail] top: description: Teleport to the highest block at your current position. usage: / @@ -492,10 +492,10 @@ commands: description: Request to teleport to the specified player. usage: / aliases: [call,ecall,etpa,tpask,etpask] - tpaall: - description: Requests all players online to teleport to you. - usage: / - aliases: [etpaall] +# tpaall: +# description: Requests all players online to teleport to you. +# usage: / +# aliases: [etpaall] tpaccept: description: Accepts a teleport request. usage: / [otherplayer] @@ -536,10 +536,10 @@ commands: description: Teleport to coordinates. usage: / [yaw] [pitch] [world] aliases: [etppos] - tpr: - description: Teleport randomly. - usage: / - aliases: [etpr, tprandom, etprandom] +# tpr: +# description: Teleport randomly. +# usage: / +# aliases: [etpr, tprandom, etprandom] tptoggle: description: Blocks all forms of teleportation. usage: / [player] [on|off] @@ -548,30 +548,30 @@ commands: description: Spawn a tree where you are looking. usage: / aliases: [etree] - unban: - description: Unbans the specified player. - usage: / - aliases: [pardon,eunban,epardon] - unbanip: - description: Unbans the specified IP address. - usage: /
- aliases: [eunbanip,pardonip,epardonip] +# unban: +# description: Unbans the specified player. +# usage: / +# aliases: [pardon,eunban,epardon] +# unbanip: +# description: Unbans the specified IP address. +# usage: /
+# aliases: [eunbanip,pardonip,epardonip] unlimited: description: Allows the unlimited placing of items. usage: / [player] aliases: [eunlimited,ul,unl,eul,eunl] - vanish: - description: Hide yourself from other players. - usage: / [player] [on|off] - aliases: [v,ev,evanish] +# vanish: +# description: Hide yourself from other players. +# usage: / [player] [on|off] +# aliases: [v,ev,evanish] warp: description: List all warps or warp to the specified location. usage: / [player] aliases: [ewarp,warps,ewarps] - weather: - description: Sets the weather. - usage: / [duration] - aliases: [rain,erain,sky,esky,storm,estorm,sun,esun,eweather] +# weather: +# description: Sets the weather. +# usage: / [duration] +# aliases: [rain,erain,sky,esky,storm,estorm,sun,esun,eweather] whois: description: Determine the username behind a nickname. usage: / diff --git a/pom.xml b/pom.xml index 7a4a98e65..a5dc4aac9 100644 --- a/pom.xml +++ b/pom.xml @@ -39,16 +39,15 @@ jitpack https://jitpack.io + + telesphoreo-repo + https://telesphoreo.me/repo/maven + Essentials - EssentialsAntiBuild - EssentialsChat - EssentialsGeoIP - EssentialsProtect EssentialsSpawn - EssentialsXMPP providers/BaseProviders providers/NMSReflectionProvider providers/PaperProvider @@ -74,6 +73,12 @@ 3.2.0 test + + me.totalfreedom + TotalFreedomMod + 2020.9 + provided +