Merge branch '2.x' of https://github.com/EssentialsX/Essentials into …

…randomteleport-improvements
EssentialsX · Dec 28, 2021 · e4e1bbb · e4e1bbb
2 parents 6d3340e + 739600e
commit e4e1bbb
Show file tree

Hide file tree

Showing 17 changed files with 191 additions and 760 deletions.
diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
     - 2.x
+    - dev/*
 
 jobs:
   build:

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -9,6 +9,7 @@ on:
     branches:
     - 2.x
     - mc/*
+    - dev/*
 
 jobs:
   build:

diff --git a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
@@ -746,7 +746,7 @@ public boolean onCommandEssentials(final CommandSender cSender, final Command co
             if (getSettings().isCommandDisabled(commandLabel)) {
                 if (getKnownCommandsProvider().getKnownCommands().containsKey(commandLabel)) {
                     final Command newCmd = getKnownCommandsProvider().getKnownCommands().get(commandLabel);
-                    if (!(newCmd instanceof PluginIdentifiableCommand) || ((PluginIdentifiableCommand) newCmd).getPlugin() != this) {
+                    if (!(newCmd instanceof PluginIdentifiableCommand) || !isEssentialsPlugin(((PluginIdentifiableCommand) newCmd).getPlugin())) {
                         return newCmd.execute(cSender, commandLabel, args);
                     }
                 }
@@ -821,6 +821,10 @@ public boolean onCommandEssentials(final CommandSender cSender, final Command co
         }
     }
 
+    private boolean isEssentialsPlugin(Plugin plugin) {
+        return plugin.getDescription().getMain().contains("com.earth2me.essentials") || plugin.getDescription().getMain().contains("net.essentialsx");
+    }
+
     public void cleanupOpenInventories() {
         for (final User user : getOnlineUsers()) {
             if (user.isRecipeSee()) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
         - 2.x
+        - dev/*
     jobs:
       build:
@@ Expand Down @@