EssentialsX
diff --git a/‎.github/ISSUE_TEMPLATE/report-a-bug.yml‎
Lines changed: 2 additions & 16 deletions b/‎.github/ISSUE_TEMPLATE/report-a-bug.yml‎
Lines changed: 2 additions & 16 deletions
diff --git a/‎Essentials/build.gradle‎
Lines changed: 5 additions & 2 deletions b/‎Essentials/build.gradle‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎Essentials/src/main/java/com/earth2me/essentials/AlternativeCommandsHandler.java‎
Lines changed: 2 additions & 1 deletion b/‎Essentials/src/main/java/com/earth2me/essentials/AlternativeCommandsHandler.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java‎
Lines changed: 1 addition & 1 deletion b/‎Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Essentials/src/main/java/com/earth2me/essentials/Essentials.java‎
Lines changed: 11 additions & 2 deletions b/‎Essentials/src/main/java/com/earth2me/essentials/Essentials.java‎
Lines changed: 11 additions & 2 deletions
diff --git a/‎Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java‎
Lines changed: 26 additions & 14 deletions b/‎Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java‎
Lines changed: 26 additions & 14 deletions
@@ -22,24 +22,10 @@ body:
   validations:
     required: true
 
-- type: textarea
-  attributes:
-    label: "`/ess version` output"
-    description: Run `/ess version` in the console, then copy and paste the full output of the command into this box.
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Server startup log
-    description: Upload your server startup log (from the start of `latest.log` up to where it says "Done!") to either https://paste.gg or https://gist.github.com, save and then paste the link in this box.
-    placeholder: "Example: https://paste.gg/p/anonymous/109dd6a10a734a3aa430d5a351ea5210"
-  validations:
-    required: true
 - type: input
   attributes:
-    label: EssentialsX config files
-    description: Upload your EssentialsX `config.yml` (and any other relevant files like `kits.yml`) to either https://paste.gg or https://gist.github.com, save and then paste the link in this box. If you included those files in the same paste as your startup log, paste the same link here.
-    placeholder: "Example: https://paste.gg/p/anonymous/109dd6a10a734a3aa430d5a351ea5210"
+    label: "`/ess dump *` output"
+    description: Run `/ess dump *` in the console, then copy and paste the link from the output of the command into this box. (If this command doesn't work, you should [update EssentialsX](https://essentialsx.net/downloads.html) and try again.)
   validations:
     required: true
 - type: input
 
@@ -10,7 +10,9 @@ dependencies {
 
     api 'io.papermc:paperlib:1.0.6'
 
-    implementation 'org.spongepowered:configurate-yaml:4.1.1'
+    api 'org.bstats:bstats-bukkit:2.2.1'
+
+    implementation 'org.spongepowered:configurate-yaml:4.1.2'
     implementation 'org.checkerframework:checker-qual:3.14.0'
 
     // Providers
@@ -28,6 +30,7 @@ shadowJar {
     dependencies {
         include (dependency('io.papermc:paperlib'))
         include (dependency('org.bstats:bstats-bukkit'))
+        include (dependency('org.bstats:bstats-base'))
         include (dependency('org.spongepowered:configurate-yaml'))
         include (dependency('org.spongepowered:configurate-core'))
         include (dependency('org.yaml:snakeyaml'))
@@ -39,7 +42,7 @@ shadowJar {
         include (project(':providers:1_8Provider'))
     }
     relocate 'io.papermc.lib', 'com.earth2me.essentials.paperlib'
-    relocate 'org.bstats.bukkit', 'com.earth2me.essentials.metrics'
+    relocate 'org.bstats', 'com.earth2me.essentials.libs.bstats'
     relocate 'org.spongepowered.configurate', 'com.earth2me.essentials.libs.configurate'
     relocate 'org.yaml.snakeyaml', 'com.earth2me.essentials.libs.snakeyaml'
     relocate 'io.leangen.geantyref', 'com.earth2me.essentials.libs.geantyref'
 
@@ -33,7 +33,8 @@ public final void addPlugin(final Plugin plugin) {
             return;
         }
         for (final Map.Entry<String, Command> entry : getPluginCommands(plugin).entrySet()) {
-            final String commandName = entry.getKey().contains(":") ? entry.getKey().split(":")[1] : entry.getKey();
+            final String[] commandSplit = entry.getKey().split(":", 2);
+            final String commandName = commandSplit.length > 1 ? commandSplit[1] : entry.getKey();
             final Command command = entry.getValue();
 
             final List<Command> pluginCommands = altcommands.computeIfAbsent(commandName.toLowerCase(Locale.ENGLISH), k -> new ArrayList<>());
 
@@ -183,7 +183,7 @@ protected void nowAsync(final IUser teleportee, final ITarget target, final Tele
         }
 
         final Location targetLoc = target.getLocation();
-        if (ess.getSettings().isTeleportSafetyEnabled() && LocationUtil.isBlockOutsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockX(), targetLoc.getBlockZ())) {
+        if (ess.getSettings().isTeleportSafetyEnabled() && !ess.getSettings().isForceDisableTeleportSafety() && LocationUtil.isBlockOutsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockX(), targetLoc.getBlockZ())) {
             targetLoc.setX(LocationUtil.getXInsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockX()));
             targetLoc.setZ(LocationUtil.getZInsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockZ()));
         }
 
@@ -49,6 +49,7 @@
 import net.ess3.api.ISettings;
 import net.ess3.nms.refl.providers.ReflFormattedCommandAliasProvider;
 import net.ess3.nms.refl.providers.ReflKnownCommandsProvider;
+import net.ess3.nms.refl.providers.ReflOnlineModeProvider;
 import net.ess3.nms.refl.providers.ReflPersistentDataProvider;
 import net.ess3.nms.refl.providers.ReflServerStateProvider;
 import net.ess3.nms.refl.providers.ReflSpawnEggProvider;
@@ -165,6 +166,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
     private transient MaterialTagProvider materialTagProvider;
     private transient SyncCommandsProvider syncCommandsProvider;
     private transient PersistentDataProvider persistentDataProvider;
+    private transient ReflOnlineModeProvider onlineModeProvider;
     private transient Kits kits;
     private transient RandomTeleport randomTeleport;
     private transient UpdateChecker updateChecker;
@@ -406,6 +408,8 @@ public void onEnable() {
                 persistentDataProvider = new ReflPersistentDataProvider(this);
             }
 
+            onlineModeProvider = new ReflOnlineModeProvider();
+
             execTimer.mark("Init(Providers)");
             reload();
 
@@ -770,12 +774,12 @@ public boolean onCommandEssentials(final CommandSender cSender, final Command co
                 sender.sendMessage(tl("commandHelpLine1", commandLabel));
                 sender.sendMessage(tl("commandHelpLine2", command.getDescription()));
                 sender.sendMessage(tl("commandHelpLine3"));
-                if (!cmd.getUsageStrings().isEmpty()) {
+                if (getSettings().isVerboseCommandUsages() && !cmd.getUsageStrings().isEmpty()) {
                     for (Map.Entry<String, String> usage : cmd.getUsageStrings().entrySet()) {
                         sender.sendMessage(tl("commandHelpLineUsage", usage.getKey().replace("<command>", commandLabel), usage.getValue()));
                     }
                 } else {
-                    sender.sendMessage(command.getUsage());
+                    sender.sendMessage(command.getUsage().replace("<command>", commandLabel));
                 }
                 if (!ex.getMessage().isEmpty()) {
                     sender.sendMessage(ex.getMessage());
@@ -1260,6 +1264,11 @@ public PersistentDataProvider getPersistentDataProvider() {
         return persistentDataProvider;
     }
 
+    @Override
+    public ReflOnlineModeProvider getOnlineModeProvider() {
+        return onlineModeProvider;
+    }
+
     @Override
     public PluginCommand getPluginCommand(final String cmd) {
         return this.getCommand(cmd);
 
@@ -66,6 +66,8 @@
 import java.util.Locale;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -75,6 +77,7 @@
 public class EssentialsPlayerListener implements Listener, FakeAccessor {
     private static final Logger LOGGER = Logger.getLogger("Essentials");
     private final transient IEssentials ess;
+    private final ConcurrentHashMap<UUID, Integer> pendingMotdTasks = new ConcurrentHashMap<>();
 
     public EssentialsPlayerListener(final IEssentials parent) {
         this.ess = parent;
@@ -216,6 +219,11 @@ public void onPlayerMove(final PlayerMoveEvent event) {
     public void onPlayerQuit(final PlayerQuitEvent event) {
         final User user = ess.getUser(event.getPlayer());
 
+        final Integer pendingId = pendingMotdTasks.remove(user.getUUID());
+        if (pendingId != null) {
+            ess.getScheduler().cancelTask(pendingId);
+        }
+
         if (hideJoinQuitMessages() || (ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentquit"))) {
             event.setQuitMessage(null);
         } else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
@@ -360,12 +368,14 @@ public void run() {
 
                 ess.runTaskAsynchronously(() -> ess.getServer().getPluginManager().callEvent(new AsyncUserDataLoadEvent(user, effectiveMessage)));
 
-                final int motdDelay = ess.getSettings().getMotdDelay() / 50;
-                final DelayMotdTask motdTask = new DelayMotdTask(user);
-                if (motdDelay > 0) {
-                    ess.scheduleSyncDelayedTask(motdTask, motdDelay);
-                } else {
-                    motdTask.run();
+                if (ess.getSettings().getMotdDelay() >= 0) {
+                    final int motdDelay = ess.getSettings().getMotdDelay() / 50;
+                    final DelayMotdTask motdTask = new DelayMotdTask(user);
+                    if (motdDelay > 0) {
+                        pendingMotdTasks.put(user.getUUID(), ess.scheduleSyncDelayedTask(motdTask, motdDelay));
+                    } else {
+                        motdTask.run();
+                    }
                 }
 
                 if (!ess.getSettings().isCommandDisabled("mail") && user.isAuthorized("essentials.mail")) {
@@ -378,6 +388,14 @@ public void run() {
                     }
                 }
 
+                if (user.isAuthorized("essentials.updatecheck")) {
+                    ess.runTaskAsynchronously(() -> {
+                        for (String str : ess.getUpdateChecker().getVersionMessages(false, false)) {
+                            user.sendMessage(str);
+                        }
+                    });
+                }
+
                 if (user.isAuthorized("essentials.fly.safelogin")) {
                     user.getBase().setFallDistance(0);
                     if (LocationUtil.shouldFly(user.getLocation())) {
@@ -419,6 +437,8 @@ class DelayMotdTask implements Runnable {
 
                 @Override
                 public void run() {
+                    pendingMotdTasks.remove(user.getUUID());
+
                     IText tempInput = null;
 
                     if (!ess.getSettings().isCommandDisabled("motd")) {
@@ -440,14 +460,6 @@ public void run() {
                         final TextPager pager = new TextPager(output, true);
                         pager.showPage("1", null, "motd", user.getSource());
                     }
-
-                    if (user.isAuthorized("essentials.updatecheck")) {
-                        ess.runTaskAsynchronously(() -> {
-                            for (String str : ess.getUpdateChecker().getVersionMessages(false, false)) {
-                                user.sendMessage(str);
-                            }
-                        });
-                    }
                 }
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ public final void addPlugin(final Plugin plugin) {`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`	`for (final Map.Entry<String, Command> entry : getPluginCommands(plugin).entrySet()) {`
`36`		`- final String commandName = entry.getKey().contains(":") ? entry.getKey().split(":")[1] : entry.getKey();`
	`36`	`+ final String[] commandSplit = entry.getKey().split(":", 2);`
	`37`	`+ final String commandName = commandSplit.length > 1 ? commandSplit[1] : entry.getKey();`
`37`	`38`	`final Command command = entry.getValue();`
`38`	`39`
`39`	`40`	`final List<Command> pluginCommands = altcommands.computeIfAbsent(commandName.toLowerCase(Locale.ENGLISH), k -> new ArrayList<>());`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ protected void nowAsync(final IUser teleportee, final ITarget target, final Tele`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`final Location targetLoc = target.getLocation();`
`186`		`- if (ess.getSettings().isTeleportSafetyEnabled() && LocationUtil.isBlockOutsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockX(), targetLoc.getBlockZ())) {`
	`186`	`+ if (ess.getSettings().isTeleportSafetyEnabled() && !ess.getSettings().isForceDisableTeleportSafety() && LocationUtil.isBlockOutsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockX(), targetLoc.getBlockZ())) {`
`187`	`187`	`targetLoc.setX(LocationUtil.getXInsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockX()));`
`188`	`188`	`targetLoc.setZ(LocationUtil.getZInsideWorldBorder(targetLoc.getWorld(), targetLoc.getBlockZ()));`
`189`	`189`	`}`