twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-09-02 05:13:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Bleeding] Implement Mojang command fallback system. Adds BUKKIT-5385

Browse Source
This commit is contained in:
t00thpick1
2014-02-07 18:40:59 -05:00
committed by Travis Watkins
parent b18bedd848
commit 553acdf0cd
8 changed files with 361 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
View File

@@ -6,6 +6,7 @@ import java.util.Date;
// CraftBukkit start
import java.util.ArrayList;
import org.apache.logging.log4j.Level;
import org.bukkit.craftbukkit.command.VanillaCommandWrapper;
import com.google.common.base.Joiner;
// CraftBukkit end
@@ -94,14 +95,23 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
return;
}
// Make sure this is a valid command
if (commandMap.getCommand(args[0]) == null) {
// If the world has no players don't run
if (this.getWorld().players.isEmpty()) {
this.b = 0;
return;
}
// If the world has no players don't run
if (this.getWorld().players.isEmpty()) {
// Handle vanilla commands;
if (minecraftserver.server.getCommandBlockOverride(args[0])) {
org.bukkit.command.Command commandBlockCommand = commandMap.getCommand("minecraft:" + args[0]);
if (commandBlockCommand instanceof VanillaCommandWrapper) {
this.b = ((VanillaCommandWrapper) commandBlockCommand).dispatchVanillaCommandBlock(this, this.e);
return;
}
}
// Make sure this is a valid command
if (commandMap.getCommand(args[0]) == null) {
this.b = 0;
return;
}