diff options
author | md_5 <git@md-5.net> | 2016-03-01 08:32:46 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-03-01 09:32:45 +1100 |
commit | aa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch) | |
tree | cb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/CommandGamemode.patch | |
parent | e1ebe524a78e27f6a2829ed4574fded3779094e1 (diff) | |
download | craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip |
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/CommandGamemode.patch')
-rw-r--r-- | nms-patches/CommandGamemode.patch | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/nms-patches/CommandGamemode.patch b/nms-patches/CommandGamemode.patch index 6280a4b1..f9e342f3 100644 --- a/nms-patches/CommandGamemode.patch +++ b/nms-patches/CommandGamemode.patch @@ -1,7 +1,7 @@ --- a/net/minecraft/server/CommandGamemode.java +++ b/net/minecraft/server/CommandGamemode.java -@@ -26,6 +26,13 @@ - EntityPlayer entityplayer = astring.length >= 2 ? a(icommandlistener, astring[1]) : b(icommandlistener); +@@ -27,6 +27,12 @@ + EntityPlayer entityplayer = astring.length >= 2 ? a(minecraftserver, icommandlistener, astring[1]) : a(icommandlistener); entityplayer.a(worldsettings_enumgamemode); + // CraftBukkit start - handle event cancelling the change @@ -10,11 +10,17 @@ + return; + } + // CraftBukkit end -+ - entityplayer.fallDistance = 0.0F; + ChatMessage chatmessage = new ChatMessage("gameMode." + worldsettings_enumgamemode.b(), new Object[0]); + if (icommandlistener.getWorld().getGameRules().getBoolean("sendCommandFeedback")) { - entityplayer.sendMessage(new ChatMessage("gameMode.changed", new Object[0])); -@@ -57,4 +64,11 @@ +@@ -49,10 +55,17 @@ + } + + public List<String> tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, BlockPosition blockposition) { +- return astring.length == 1 ? a(astring, new String[] { "survival", "creative", "adventure", "spectator"}) : (astring.length == 2 ? a(astring, minecraftserver.getPlayers()) : Collections.emptyList()); ++ return astring.length == 1 ? a(astring, new String[] { "survival", "creative", "adventure", "spectator"}) : (astring.length == 2 ? a(astring, minecraftserver.getPlayers()) : Collections.<String>emptyList()); // CraftBukkit - decompile error + } + public boolean isListStart(String[] astring, int i) { return i == 1; } |