mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-27 19:09:23 +00:00
f40d340092
--------- Co-authored-by: MC_XiaoHei <xiaohei.xor7studio@foxmail.com> Co-authored-by: Bluemangoo <chenfy2006@qq.com>
43 lines
2.0 KiB
Diff
43 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Fri, 2 Feb 2024 13:18:22 +0800
|
|
Subject: [PATCH] Force minecraft command
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java b/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java
|
|
index 90ed57a7fbcd0625b64084347460e9864216f610..1dadec002e620b3e4906ab3381944cc9d807523b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/command/CraftCommandMap.java
|
|
@@ -14,4 +14,18 @@ public class CraftCommandMap extends SimpleCommandMap {
|
|
public Map<String, Command> getKnownCommands() {
|
|
return this.knownCommands;
|
|
}
|
|
+
|
|
+ // Leaves start - force minecraft command
|
|
+ @Override
|
|
+ public Command getCommand(String name) {
|
|
+ Command target = super.getCommand(name);
|
|
+ if (org.leavesmc.leaves.LeavesConfig.forceMinecraftCommand && !(target instanceof org.bukkit.craftbukkit.command.VanillaCommandWrapper)) {
|
|
+ Command minecraftTarget = super.getCommand("minecraft:" + name);
|
|
+ if (minecraftTarget != null) {
|
|
+ return minecraftTarget;
|
|
+ }
|
|
+ }
|
|
+ return target;
|
|
+ }
|
|
+ // Leaves end - force minecraft command
|
|
}
|
|
diff --git a/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
|
|
index 021d7bd9940ec2dc63126af1facdc89086801bed..c0d0c3d4be90fb0d9766ff62dc66baeb551dd080 100644
|
|
--- a/src/main/java/org/leavesmc/leaves/LeavesConfig.java
|
|
+++ b/src/main/java/org/leavesmc/leaves/LeavesConfig.java
|
|
@@ -859,7 +859,7 @@ public final class LeavesConfig {
|
|
public static boolean bstatsPrivacyMode = false;
|
|
|
|
@GlobalConfig(name = "force-minecraft-command", category = "misc")
|
|
- public static boolean forceMinecraftCommand = true;
|
|
+ public static boolean forceMinecraftCommand = false;
|
|
|
|
// Leaves end - misc
|
|
|