SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't disconnect player when we have no vanilla tab completions.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-01-21 15:32:54 +11:00
parent 4db02c4c68
commit ed286940f1
13 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
View File

@@ -1,4 +1,4 @@
From e9731cbc6edf8f3d913c9cd54e87da240ccb67cf Mon Sep 17 00:00:00 2001
From 1e8478189ab8e3c19971d100eeb66ea74625a5e3 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 18 Dec 2013 10:32:15 +1100
Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
@@ -32,7 +32,7 @@ index e63f17c..e58be15 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0ac8f52..fb346f6 100644
index 0ac8f52..1648d0e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -548,6 +548,12 @@ public final class CraftServer implements Server {
@@ -48,7 +48,7 @@ index 0ac8f52..fb346f6 100644
sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
@@ -1403,15 +1409,23 @@ public final class CraftServer implements Server {
@@ -1403,15 +1409,27 @@ public final class CraftServer implements Server {
}
// Spigot End
@@ -63,7 +63,11 @@ index 0ac8f52..fb346f6 100644
+ {
+ completions.addAll( bukkitCompletions );
+ }
+ completions.addAll( org.spigotmc.VanillaCommandWrapper.complete( player, message ) );
+ List<String> vanillaCompletions = org.spigotmc.VanillaCommandWrapper.complete( player, message );
+ if ( vanillaCompletions != null )
+ {
+ completions.addAll( vanillaCompletions );
+ }
+ // Spigot End
} catch (CommandException ex) {
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
@@ -314,5 +318,5 @@ index 0000000..a6c76cc
+ }
+}
--
1.8.4.msysgit.0
1.8.3.2