diff --git a/Bukkit-Patches/0025-Remove-deprecation-on-some-player-lookup-methods.patch b/Bukkit-Patches/0025-Remove-deprecation-on-some-player-lookup-methods.patch index 54702bd25..31fd3fbc3 100644 --- a/Bukkit-Patches/0025-Remove-deprecation-on-some-player-lookup-methods.patch +++ b/Bukkit-Patches/0025-Remove-deprecation-on-some-player-lookup-methods.patch @@ -1,4 +1,4 @@ -From 6ada6b20f8e3682dd430300130b43f69c35377c4 Mon Sep 17 00:00:00 2001 +From e82a54ab86950b4d22601fc3bda15c2df118142c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 30 Mar 2014 15:58:22 +1100 Subject: [PATCH] Remove deprecation on some player lookup methods @@ -26,11 +26,15 @@ index 6b9c9f3..7d8736e 100644 return server.matchPlayer(name); } diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index cbf8746..7da5ab6 100644 +index cbf8746..d726cd6 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java -@@ -24,7 +24,6 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio - * guaranteed to be unique +@@ -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 @@ -38,10 +42,15 @@ index cbf8746..7da5ab6 100644 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d2cb517..72ef028 100644 +index d2cb517..d745dfb 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -273,7 +273,6 @@ public interface Server extends PluginMessageRecipient { +@@ -268,23 +268,17 @@ public interface Server extends PluginMessageRecipient { + *

+ * This method may not return objects for offline players. + * +- * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer +- * guaranteed to be unique * @param name the name to look up * @return a player if one was found, null otherwise */ @@ -49,7 +58,10 @@ index d2cb517..72ef028 100644 public Player getPlayer(String name); /** -@@ -284,7 +283,6 @@ public interface Server extends PluginMessageRecipient { + * Gets the player with the exact given name, case insensitive. + * +- * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer +- * guaranteed to be unique * @param name Exact name of the player to retrieve * @return a player object if one was found, null otherwise */ @@ -57,7 +69,12 @@ index d2cb517..72ef028 100644 public Player getPlayerExact(String name); /** -@@ -299,7 +297,6 @@ public interface Server extends PluginMessageRecipient { +@@ -294,12 +288,9 @@ public interface Server extends PluginMessageRecipient { + * This list is not sorted in any particular order. If an exact match is + * found, the returned list will only contain a single result. + * +- * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer +- * guaranteed to be unique * @param name the (partial) name to match * @return list of all possible players */