Stage 1

By: md_5 <git@md-5.net>

Bukkit-Patches/0025-Remove-deprecation-on-some-player-lookup-methods.patch

@@ -1,4 +1,4 @@
-From e82a54ab86950b4d22601fc3bda15c2df118142c Mon Sep 17 00:00:00 2001
+From 41d28d22d8a37fe2c9f24c0decf7cf34d863ac26 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 30 Mar 2014 15:58:22 +1100
 Subject: [PATCH] Remove deprecation on some player lookup methods
@@ -25,24 +25,8 @@ index 6b9c9f3..7d8736e 100644
      public static List<Player> matchPlayer(String name) {
          return server.matchPlayer(name);
      }
-diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index cbf8746..d726cd6 100644
---- a/src/main/java/org/bukkit/OfflinePlayer.java
-+++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -20,11 +20,8 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
-     /**
-      * Returns the name of this player
-      *
--     * @deprecated Use {@link #getUniqueId()} as player names are no longer
--     *     guaranteed to be unique
-      * @return Player name
-      */
--    @Deprecated
-     public String getName();
- 
-     /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d2cb517..d745dfb 100644
+index 22dc74a..6b21ea1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -268,23 +268,17 @@ public interface Server extends PluginMessageRecipient {