Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From ecf8a9f407c07efd658bfc06ca1c2628925c66f2 Mon Sep 17 00:00:00 2001
+From 92ffae9c8707c17a643cb877d92f3e0fa9d23bcc 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 6c07c03..efb3262 100644
+index 50f9bae..fb303e2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,43 +1,23 @@
@@ -23,7 +23,7 @@ index 6c07c03..efb3262 100644
 +
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.7.2-R0.3-SNAPSHOT</version>
+     <version>1.7.2-R0.4-SNAPSHOT</version>
 -    <name>Bukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot-API</name>
@@ -65,5 +65,5 @@ index 6c07c03..efb3262 100644
          <plugins>
              <plugin>
 -- 
-1.8.3.2
+1.8.4.msysgit.0
 

Bukkit-Patches/0002-Measure-Timings-Duration.patch

@@ -1,4 +1,4 @@
-From 9e3fffd5a97e355ca42d86c9ef445efe2b58516f Mon Sep 17 00:00:00 2001
+From 2674d1cc80c1aba22c182561dd5da0b048a33b7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Measure Timings Duration
@@ -37,10 +37,10 @@ index 05cfcb0..c2874f1 100644
                  if (separate) sender.sendMessage("Names written to " + names.getPath());
              } catch (IOException e) {
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 3c9611b..2c4b03b 100644
+index 787dcfe..b870ecd 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -275,6 +275,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -280,6 +280,7 @@ public final class SimplePluginManager implements PluginManager {
              }
          }
  
@@ -49,5 +49,5 @@ index 3c9611b..2c4b03b 100644
      }
  
 -- 
-1.8.3.2
+1.8.4.msysgit.0
 

Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch

@@ -1,32 +0,0 @@
-From 7a4e9a52584e1a01c04a7c8cd0d17743f6fd6414 Mon Sep 17 00:00:00 2001
-From: Thinkofdeath <thethinkofdeath@gmail.com>
-Date: Wed, 18 Dec 2013 10:19:50 +1100
-Subject: [PATCH] Allow for fallback commands to be removed.
-
-
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 9ae0bce..53c9207 100644
---- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -333,4 +333,18 @@ public class SimpleCommandMap implements CommandMap {
-             }
-         }
-     }
-+
-+    // Spigot Start
-+    public static void removeFallback(String name)
-+    {
-+        Iterator<VanillaCommand> it = fallbackCommands.iterator();
-+        while ( it.hasNext() )
-+        {
-+            if ( it.next().getName().equals( name ) )
-+            {
-+                it.remove();
-+            }
-+        }
-+    }
-+    // Spigot End
- }
--- 
-1.8.3.2
-

Bukkit-Patches/0020-Fix-Tab-Completion-for-Some-Commands.patch

@@ -1,4 +1,4 @@
-From 9bbc5d1b1da84518c2b6bc5fa2bca12a16429594 Mon Sep 17 00:00:00 2001
+From 600904b4ab7510e3a9915305e720122073b7064b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 24 Dec 2013 10:14:25 +1100
 Subject: [PATCH] Fix Tab Completion for Some Commands
@@ -39,12 +39,12 @@ index ffbcac1..16dfdbd 100644
 +    // Spigot End
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/TellCommand.java b/src/main/java/org/bukkit/command/defaults/TellCommand.java
-index d0aa102..0c2c9a1 100644
+index 287f49f..fc49207 100644
 --- a/src/main/java/org/bukkit/command/defaults/TellCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/TellCommand.java
-@@ -48,4 +48,16 @@ public class TellCommand extends VanillaCommand {
-     public boolean matches(String input) {
-         return input.equalsIgnoreCase("tell") || input.equalsIgnoreCase("w") || input.equalsIgnoreCase("msg");
+@@ -45,4 +45,16 @@ public class TellCommand extends VanillaCommand {
+ 
+         return true;
      }
 +
 +    // Spigot Start
@@ -81,5 +81,5 @@ index c9ac1ce..a687fef 100644
 +    // Spigot End
  }
 -- 
-1.8.3.2
+1.8.4.msysgit.0
 

Bukkit-Patches/0021-Add-Spigot-Links.patch

@@ -1,4 +1,4 @@
-From 14c006ae726e917824a6bd4e394582f4834a2d28 Mon Sep 17 00:00:00 2001
+From 250fe28a27eff40f1725c1cf1384f06551e76dea Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 23 Jan 2014 13:17:38 +1100
 Subject: [PATCH] Add Spigot Links
@@ -25,5 +25,5 @@ index a51766e..1905b8d 100644
  Compilation
  -----------
 -- 
-1.8.3.2
+1.8.4.msysgit.0
 

Bukkit-Patches/0022-Implement-Locale-Getter-for-Players.patch

@@ -1,11 +1,11 @@
-From a75411c70903a67ed6353397dc4513551fb61d7a Mon Sep 17 00:00:00 2001
+From 84f288a09f1bd1e57582a8cdab93a413a0cef7e0 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:10:49 +1100
 Subject: [PATCH] Implement Locale Getter for Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index adef230..8489bc9 100644
+index 5a8c13e..204c4b2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1067,6 +1067,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -26,5 +26,5 @@ index adef230..8489bc9 100644
  
      Spigot spigot();
 -- 
-1.8.3.2
+1.8.4.msysgit.0
 

Bukkit-Patches/0023-Add-support-for-fetching-hidden-players.patch

@@ -1,11 +1,11 @@
-From 40166667a533e1ae2f6da758b14ebe7c17fb5b48 Mon Sep 17 00:00:00 2001
+From 874417c9a73472f62a4ba3bfbeac8db77d0831eb Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:02:11 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8489bc9..d18ca2d 100644
+index 204c4b2..6237663 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1077,6 +1077,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -26,5 +26,5 @@ index 8489bc9..d18ca2d 100644
  
      Spigot spigot();
 -- 
-1.7.10.4
+1.8.4.msysgit.0