Upstream merge + remove 3 pulled patches.

By: md_5 <md_5@live.com.au>

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From af02a7e6f7a94b882fc13435e78e9f2eca684060 Mon Sep 17 00:00:00 2001
+From 4563fe77bd20047b474f591af71f2f91ccd9b2b3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index fbdc3c3..34c13e9 100644
+index 4209f2a..37ef0ef 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index fbdc3c3..34c13e9 100644
 +
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.6.2-R0.2-SNAPSHOT</version>
+     <version>1.6.2-R1.1-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>

Bukkit-Patches/0012-Console-Command-Completion.patch

@@ -1,78 +0,0 @@
-From f9a4d23f040aa2b30d09b6e563fb90a87c85731a Mon Sep 17 00:00:00 2001
-From: Phillip Schichtel <quick_wango@code-infection.de>
-Date: Mon, 29 Apr 2013 23:07:42 +0200
-Subject: [PATCH] Console Command Completion
-
-Implement command tab completion in the console. Adds BUKKIT-4168
-
-To accomplish this 2 changes to Bukkit were required:
-- the player check in Command.tabComplete() had to be removed
-- the SimpleCommandMap prepends the / only for players
-
-diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 5416c71..2f189ca 100644
---- a/src/main/java/org/bukkit/command/Command.java
-+++ b/src/main/java/org/bukkit/command/Command.java
-@@ -78,18 +78,13 @@ public abstract class Command {
-         Validate.notNull(args, "Arguments cannot be null");
-         Validate.notNull(alias, "Alias cannot be null");
- 
--        if (!(sender instanceof Player) || args.length == 0) {
--            return ImmutableList.of();
--        }
--
-         String lastWord = args[args.length - 1];
- 
--        Player senderPlayer = (Player) sender;
--
-         ArrayList<String> matchedPlayers = new ArrayList<String>();
-+        final boolean noPlayer = !(sender instanceof Player);
-         for (Player player : sender.getServer().getOnlinePlayers()) {
-             String name = player.getName();
--            if (senderPlayer.canSee(player) && StringUtil.startsWithIgnoreCase(name, lastWord)) {
-+            if (noPlayer || ((Player) sender).canSee(player) && StringUtil.startsWithIgnoreCase(name, lastWord)) {
-                 matchedPlayers.add(name);
-             }
-         }
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index f567dc0..f716782 100644
---- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -16,6 +16,7 @@ import java.util.regex.Pattern;
- import org.apache.commons.lang.Validate;
- import org.bukkit.Server;
- import org.bukkit.command.defaults.*;
-+import org.bukkit.entity.Player;
- import org.bukkit.util.StringUtil;
- 
- public class SimpleCommandMap implements CommandMap {
-@@ -226,6 +227,8 @@ public class SimpleCommandMap implements CommandMap {
-             ArrayList<String> completions = new ArrayList<String>();
-             Map<String, Command> knownCommands = this.knownCommands;
- 
-+            final String prefix = (sender instanceof Player ? "/" : "");
-+
-             for (VanillaCommand command : fallbackCommands) {
-                 String name = command.getName();
- 
-@@ -241,7 +244,7 @@ public class SimpleCommandMap implements CommandMap {
-                     continue;
-                 }
- 
--                completions.add('/' + name);
-+                completions.add(prefix + name);
-             }
- 
-             for (Map.Entry<String, Command> commandEntry : knownCommands.entrySet()) {
-@@ -254,7 +257,7 @@ public class SimpleCommandMap implements CommandMap {
-                 String name = commandEntry.getKey(); // Use the alias, not command name
- 
-                 if (StringUtil.startsWithIgnoreCase(name, cmdLine)) {
--                    completions.add('/' + name);
-+                    completions.add(prefix + name);
-                 }
-             }
- 
--- 
-1.8.1.2
-

Bukkit-Patches/0012-InventoryClickEvent-getClickedInventory.patch

@@ -1,4 +1,4 @@
-From 325d5e9fcec324f6d39425a4dede2a6b1eb1d793 Mon Sep 17 00:00:00 2001
+From 17fc2456d07aaeff2099321de056e6a61e18462c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 7 Jul 2013 10:32:05 -0400
 Subject: [PATCH] InventoryClickEvent getClickedInventory

Bukkit-Patches/0013-Added-getAllSessionData-to-the-Conversation-API.patch

@@ -1,4 +1,4 @@
-From 1f0602e700904904b1d77ec02b066f955dcf6ea0 Mon Sep 17 00:00:00 2001
+From 5d672b1aa92376a8e13540221f774f14ff96b2d7 Mon Sep 17 00:00:00 2001
 From: Alex Bennett <alex.eugene.bennett@gmail.com>
 Date: Thu, 11 Jul 2013 15:31:32 -0500
 Subject: [PATCH] Added getAllSessionData() to the Conversation API.

Bukkit-Patches/0014-Catch-Conversation-API-Errors.patch

@@ -1,4 +1,4 @@
-From fb52162279c4bf3d6c38cf9f731e60addeffb073 Mon Sep 17 00:00:00 2001
+From 8c044d475e5ebdf5ad41667d3db04a03cf4dc33f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 22 Jul 2013 19:09:43 +1000
 Subject: [PATCH] Catch Conversation API Errors

Bukkit-Patches/0015-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From c5cfcb06166b8f6a1e410bfc19340fdd8e641019 Mon Sep 17 00:00:00 2001
+From 64dc76e6adadefc5072c492ca1ebd81e88fa95a9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API

Bukkit-Patches/0016-Expand-Boolean-Prompt-Values.patch

@@ -1,11 +1,11 @@
-From eff7918f5154d1394004f40e5f3a74f99793a177 Mon Sep 17 00:00:00 2001
+From f8a6577edc2c37aa3bc8cffd9fbf29491488bade Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:42:16 +1000
 Subject: [PATCH] Expand Boolean Prompt Values
 
 
 diff --git a/src/main/java/org/bukkit/conversations/BooleanPrompt.java b/src/main/java/org/bukkit/conversations/BooleanPrompt.java
-index 3bfd733..cd29a0c 100644
+index 6abb354..a51e754 100644
 --- a/src/main/java/org/bukkit/conversations/BooleanPrompt.java
 +++ b/src/main/java/org/bukkit/conversations/BooleanPrompt.java
 @@ -14,12 +14,13 @@ public abstract class BooleanPrompt extends ValidatingPrompt{

Bukkit-Patches/0017-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,4 +1,4 @@
-From f71dbed41b95b2db2780fc240a9788736f6e19ab Mon Sep 17 00:00:00 2001
+From 2b0c15a4f33f6f6f08f59c0245675a45a83ac572 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:49:36 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability