aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0316-Improve-scoreboard-entries.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/api/0316-Improve-scoreboard-entries.patch')
-rw-r--r--patches/api/0316-Improve-scoreboard-entries.patch34
1 files changed, 17 insertions, 17 deletions
diff --git a/patches/api/0316-Improve-scoreboard-entries.patch b/patches/api/0316-Improve-scoreboard-entries.patch
index d6e077bd86..26f03310e9 100644
--- a/patches/api/0316-Improve-scoreboard-entries.patch
+++ b/patches/api/0316-Improve-scoreboard-entries.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve scoreboard entries
diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
-index a625bcab8e77b05b3341a52c708fae1542b7e3d5..a193ffabb05160b462dee1ba8f687fdbc84405b6 100644
+index 35755c9165c1b48eaacfff86a50a7973476fe04b..d6d52bc9185e8a1581ccfa57df3550bc12d9872a 100644
--- a/src/main/java/org/bukkit/scoreboard/Objective.java
+++ b/src/main/java/org/bukkit/scoreboard/Objective.java
@@ -148,9 +148,8 @@ public interface Objective {
@@ -14,8 +14,8 @@ index a625bcab8e77b05b3341a52c708fae1542b7e3d5..a193ffabb05160b462dee1ba8f687fdb
* @see #getScore(String)
- * @deprecated Scoreboards can contain entries that aren't players
*/
-- @Deprecated
-+ // @Deprecated // Paper
+- @Deprecated(since = "1.7.8")
++ // @Deprecated(since = "1.7.8") // Paper
@NotNull
Score getScore(@NotNull OfflinePlayer player);
@@ -37,7 +37,7 @@ index a625bcab8e77b05b3341a52c708fae1542b7e3d5..a193ffabb05160b462dee1ba8f687fdb
+ // Paper end - improve scoreboard entries
}
diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
-index 3377511e1a6dd4aeb78871e47169d5bd9456c1aa..4a59f2734833cf39800b9aafbc1c5c6953c2d8f3 100644
+index 1cba9a96cc7efce2a4394add33e4c0369f94be31..81ca0c62ce32204681fcb8fd751d12b4fb0aeb97 100644
--- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java
+++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
@@ -215,9 +215,8 @@ public interface Scoreboard {
@@ -46,8 +46,8 @@ index 3377511e1a6dd4aeb78871e47169d5bd9456c1aa..4a59f2734833cf39800b9aafbc1c5c69
* @see #getScores(String)
- * @deprecated Scoreboards can contain entries that aren't players
*/
-- @Deprecated
-+ // @Deprecated // Paper
+- @Deprecated(since = "1.7.8")
++ // @Deprecated(since = "1.7.8") // Paper
@NotNull
Set<Score> getScores(@NotNull OfflinePlayer player);
@@ -57,8 +57,8 @@ index 3377511e1a6dd4aeb78871e47169d5bd9456c1aa..4a59f2734833cf39800b9aafbc1c5c69
* @see #resetScores(String)
- * @deprecated Scoreboards can contain entries that aren't players
*/
-- @Deprecated
-+ // @Deprecated // Paper
+- @Deprecated(since = "1.7.8")
++ // @Deprecated(since = "1.7.8") // Paper
void resetScores(@NotNull OfflinePlayer player);
/**
@@ -68,8 +68,8 @@ index 3377511e1a6dd4aeb78871e47169d5bd9456c1aa..4a59f2734833cf39800b9aafbc1c5c69
* @see #getEntryTeam(String)
- * @deprecated Scoreboards can contain entries that aren't players
*/
-- @Deprecated
-+ // @Deprecated // Paper
+- @Deprecated(since = "1.8.6")
++ // @Deprecated(since = "1.8.6") // Paper
@Nullable
Team getPlayerTeam(@NotNull OfflinePlayer player);
@@ -110,7 +110,7 @@ index 3377511e1a6dd4aeb78871e47169d5bd9456c1aa..4a59f2734833cf39800b9aafbc1c5c69
+ // Paper end - improve scoreboard entries
}
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 4d2b8e10263802432dfeac72666487f9547cd2c5..dff76db4a4c37c760144f00c1aa8f2bcac45ba1f 100644
+index 38deee00cfe2f6803070e98cd9ded95d859bf8e1..c500de6ed19bdf732f7bedbedb19a4b37ca343f8 100644
--- a/src/main/java/org/bukkit/scoreboard/Team.java
+++ b/src/main/java/org/bukkit/scoreboard/Team.java
@@ -295,9 +295,8 @@ public interface Team extends net.kyori.adventure.audience.ForwardingAudience {
@@ -119,8 +119,8 @@ index 4d2b8e10263802432dfeac72666487f9547cd2c5..dff76db4a4c37c760144f00c1aa8f2bc
* @see #addEntry(String)
- * @deprecated Teams can contain entries that aren't players
*/
-- @Deprecated
-+ // @Deprecated // Paper
+- @Deprecated(since = "1.8.6")
++ // @Deprecated(since = "1.8.6") // Paper
void addPlayer(@NotNull OfflinePlayer player);
/**
@@ -130,8 +130,8 @@ index 4d2b8e10263802432dfeac72666487f9547cd2c5..dff76db4a4c37c760144f00c1aa8f2bc
* @see #removeEntry(String)
- * @deprecated Teams can contain entries that aren't players
*/
-- @Deprecated
-+ // @Deprecated // Paper
+- @Deprecated(since = "1.8.6")
++ // @Deprecated(since = "1.8.6") // Paper
boolean removePlayer(@NotNull OfflinePlayer player);
/**
@@ -141,8 +141,8 @@ index 4d2b8e10263802432dfeac72666487f9547cd2c5..dff76db4a4c37c760144f00c1aa8f2bc
* @see #hasEntry(String)
- * @deprecated Teams can contain entries that aren't players
*/
-- @Deprecated
-+ // @Deprecated // Paper
+- @Deprecated(since = "1.8.6")
++ // @Deprecated(since = "1.8.6") // Paper
boolean hasPlayer(@NotNull OfflinePlayer player);
/**
* Checks to see if the specified entry is a member of this team.