SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge, lots of conflicts

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-06-22 19:25:10 +10:00
parent 07a1436667
commit 9ab31295a9
120 changed files with 252 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 41d28d22d8a37fe2c9f24c0decf7cf34d863ac26 Mon Sep 17 00:00:00 2001
From 6f3e1435bb97f1388c4a9c1b98077c9a9f673137 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
@@ -6,10 +6,10 @@ 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 6b9c9f3..7d8736e 100644
index dafea2e..8b0005e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -182,7 +182,6 @@ public final class Bukkit {
@@ -183,7 +183,6 @@ public final class Bukkit {
/**
* @see Server#getPlayer(String name)
*/
@@ -17,7 +17,7 @@ index 6b9c9f3..7d8736e 100644
public static Player getPlayer(String name) {
return server.getPlayer(name);
}
@@ -190,7 +189,6 @@ public final class Bukkit {
@@ -191,7 +190,6 @@ public final class Bukkit {
/**
* @see Server#matchPlayer(String name)
*/
@@ -25,8 +25,16 @@ index 6b9c9f3..7d8736e 100644
public static List<Player> matchPlayer(String name) {
return server.matchPlayer(name);
}
@@ -433,7 +431,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 22dc74a..6b21ea1 100644
index 3c4d541..fbc8b87 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 {
@@ -67,5 +75,5 @@ index 22dc74a..6b21ea1 100644
/**
--
1.8.3.2
1.9.1