79 lines
3 KiB
Diff
79 lines
3 KiB
Diff
From e3225adc7599d9748290a68334ec8635b803d6c1 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
|
|
|
|
Most of these methods still have plenty of use given that only one player with each name can exist at a time. Deprecating these methods renders even basic functionality such as /msg <name> impossible without causing compiler warnings. We will maintain this API and it should be considered safe and appropriate for most use cases.
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index cc071c6..b85a699 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -197,7 +197,6 @@ public final class Bukkit {
|
|
/**
|
|
* @see Server#getPlayer(String name)
|
|
*/
|
|
- @Deprecated
|
|
public static Player getPlayer(String name) {
|
|
return server.getPlayer(name);
|
|
}
|
|
@@ -205,7 +204,6 @@ public final class Bukkit {
|
|
/**
|
|
* @see Server#matchPlayer(String name)
|
|
*/
|
|
- @Deprecated
|
|
public static List<Player> matchPlayer(String name) {
|
|
return server.matchPlayer(name);
|
|
}
|
|
@@ -448,7 +446,6 @@ public final class Bukkit {
|
|
/**
|
|
* @see Server#getPlayerExact(String name)
|
|
*/
|
|
- @Deprecated
|
|
public static Player getPlayerExact(String name) {
|
|
return server.getPlayerExact(name);
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 573b33b..f861214 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -308,23 +308,17 @@ public interface Server extends PluginMessageRecipient {
|
|
* <p>
|
|
* 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
|
|
*/
|
|
- @Deprecated
|
|
public Player getPlayer(String name);
|
|
|
|
/**
|
|
* 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
|
|
*/
|
|
- @Deprecated
|
|
public Player getPlayerExact(String name);
|
|
|
|
/**
|
|
@@ -334,12 +328,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
|
|
*/
|
|
- @Deprecated
|
|
public List<Player> matchPlayer(String name);
|
|
|
|
/**
|
|
--
|
|
2.1.0
|
|
|