Skip to content

Commit fd069dd

Browse files
Remove incorrect throws javadoc in Team (#7869)
1 parent 8fc0999 commit fd069dd

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

patches/api/0005-Adventure.patch

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4102,10 +4102,10 @@ index 5c855dbd0da895392f7a6e92cdc90782baf614ad..1ada91d790abedbc9b3aeb6e96467a0d
41024102

41034103
/**
41044104
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
4105-
index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..07a9fa68075a2c5f5a4a7519976b506526d95ca0 100644
4105+
index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..47b10df619ad2520b9bb673e2220f36391680f1b 100644
41064106
--- a/src/main/java/org/bukkit/scoreboard/Team.java
41074107
+++ b/src/main/java/org/bukkit/scoreboard/Team.java
4108-
@@ -22,14 +22,102 @@ public interface Team {
4108+
@@ -22,14 +22,100 @@ public interface Team {
41094109
*/
41104110
@NotNull
41114111
String getName() throws IllegalStateException;
@@ -4122,8 +4122,6 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..07a9fa68075a2c5f5a4a7519976b5065
41224122
+ * Sets the name displayed to entries for this team
41234123
+ *
41244124
+ * @param displayName New display name
4125-
+ * @throws IllegalArgumentException if displayName is longer than 128
4126-
+ * characters.
41274125
+ * @throws IllegalStateException if this team has been unregistered
41284126
+ */
41294127
+ void displayName(@Nullable net.kyori.adventure.text.Component displayName) throws IllegalStateException, IllegalArgumentException;
@@ -4208,7 +4206,7 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..07a9fa68075a2c5f5a4a7519976b5065
42084206
String getDisplayName() throws IllegalStateException;
42094207

42104208
/**
4211-
@@ -39,7 +127,9 @@ public interface Team {
4209+
@@ -39,7 +125,9 @@ public interface Team {
42124210
* @throws IllegalArgumentException if displayName is longer than 128
42134211
* characters.
42144212
* @throws IllegalStateException if this team has been unregistered
@@ -4218,7 +4216,7 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..07a9fa68075a2c5f5a4a7519976b5065
42184216
void setDisplayName(@NotNull String displayName) throws IllegalStateException, IllegalArgumentException;
42194217

42204218
/**
4221-
@@ -47,8 +137,10 @@ public interface Team {
4219+
@@ -47,8 +135,10 @@ public interface Team {
42224220
*
42234221
* @return Team prefix
42244222
* @throws IllegalStateException if this team has been unregistered
@@ -4229,7 +4227,7 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..07a9fa68075a2c5f5a4a7519976b5065
42294227
String getPrefix() throws IllegalStateException;
42304228

42314229
/**
4232-
@@ -59,7 +151,9 @@ public interface Team {
4230+
@@ -59,7 +149,9 @@ public interface Team {
42334231
* @throws IllegalArgumentException if prefix is longer than 64
42344232
* characters
42354233
* @throws IllegalStateException if this team has been unregistered
@@ -4239,7 +4237,7 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..07a9fa68075a2c5f5a4a7519976b5065
42394237
void setPrefix(@NotNull String prefix) throws IllegalStateException, IllegalArgumentException;
42404238

42414239
/**
4242-
@@ -67,8 +161,10 @@ public interface Team {
4240+
@@ -67,8 +159,10 @@ public interface Team {
42434241
*
42444242
* @return the team's current suffix
42454243
* @throws IllegalStateException if this team has been unregistered
@@ -4250,7 +4248,7 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..07a9fa68075a2c5f5a4a7519976b5065
42504248
String getSuffix() throws IllegalStateException;
42514249

42524250
/**
4253-
@@ -79,7 +175,9 @@ public interface Team {
4251+
@@ -79,7 +173,9 @@ public interface Team {
42544252
* @throws IllegalArgumentException if suffix is longer than 64
42554253
* characters
42564254
* @throws IllegalStateException if this team has been unregistered
@@ -4260,7 +4258,7 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..07a9fa68075a2c5f5a4a7519976b5065
42604258
void setSuffix(@NotNull String suffix) throws IllegalStateException, IllegalArgumentException;
42614259

42624260
/**
4263-
@@ -90,8 +188,10 @@ public interface Team {
4261+
@@ -90,8 +186,10 @@ public interface Team {
42644262
*
42654263
* @return team color, defaults to {@link ChatColor#RESET}
42664264
* @throws IllegalStateException if this team has been unregistered
@@ -4271,7 +4269,7 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..07a9fa68075a2c5f5a4a7519976b5065
42714269
ChatColor getColor() throws IllegalStateException;
42724270

42734271
/**
4274-
@@ -102,7 +202,9 @@ public interface Team {
4272+
@@ -102,7 +200,9 @@ public interface Team {
42754273
*
42764274
* @param color new color, must be non-null. Use {@link ChatColor#RESET} for
42774275
* no color

patches/api/0346-Improve-scoreboard-entries.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ index 1ada91d790abedbc9b3aeb6e96467a0d78560f15..fc3456bb79f2fe1504359455b937c162
110110
+ // Paper end
111111
}
112112
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
113-
index 07a9fa68075a2c5f5a4a7519976b506526d95ca0..51205a71d243195fdf35515374a1e9ef5df26bc0 100644
113+
index 47b10df619ad2520b9bb673e2220f36391680f1b..cbc82a03c24f746b913b30f14ecb0c08cdb42c24 100644
114114
--- a/src/main/java/org/bukkit/scoreboard/Team.java
115115
+++ b/src/main/java/org/bukkit/scoreboard/Team.java
116-
@@ -310,9 +310,8 @@ public interface Team {
116+
@@ -308,9 +308,8 @@ public interface Team {
117117
* @throws IllegalArgumentException if player is null
118118
* @throws IllegalStateException if this team has been unregistered
119119
* @see #addEntry(String)
@@ -124,7 +124,7 @@ index 07a9fa68075a2c5f5a4a7519976b506526d95ca0..51205a71d243195fdf35515374a1e9ef
124124
void addPlayer(@NotNull OfflinePlayer player) throws IllegalStateException, IllegalArgumentException;
125125

126126
/**
127-
@@ -334,9 +333,8 @@ public interface Team {
127+
@@ -332,9 +331,8 @@ public interface Team {
128128
* @throws IllegalArgumentException if player is null
129129
* @throws IllegalStateException if this team has been unregistered
130130
* @see #removeEntry(String)
@@ -135,7 +135,7 @@ index 07a9fa68075a2c5f5a4a7519976b506526d95ca0..51205a71d243195fdf35515374a1e9ef
135135
boolean removePlayer(@NotNull OfflinePlayer player) throws IllegalStateException, IllegalArgumentException;
136136

137137
/**
138-
@@ -364,9 +362,8 @@ public interface Team {
138+
@@ -362,9 +360,8 @@ public interface Team {
139139
* @throws IllegalArgumentException if player is null
140140
* @throws IllegalStateException if this team has been unregistered
141141
* @see #hasEntry(String)
@@ -146,7 +146,7 @@ index 07a9fa68075a2c5f5a4a7519976b506526d95ca0..51205a71d243195fdf35515374a1e9ef
146146
boolean hasPlayer(@NotNull OfflinePlayer player) throws IllegalArgumentException, IllegalStateException;
147147
/**
148148
* Checks to see if the specified entry is a member of this team.
149-
@@ -397,6 +394,42 @@ public interface Team {
149+
@@ -395,6 +392,42 @@ public interface Team {
150150
*/
151151
void setOption(@NotNull Option option, @NotNull OptionStatus status) throws IllegalStateException;
152152

patches/api/0355-Multiple-Entries-with-Scoreboards.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Multiple Entries with Scoreboards
55

66

77
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
8-
index 51205a71d243195fdf35515374a1e9ef5df26bc0..0f5c49d41c9460da0ba913b4ca8bef375f2c23df 100644
8+
index cbc82a03c24f746b913b30f14ecb0c08cdb42c24..06a5d3177ca7ab90c3fd9d2053b2ec5e887c7c62 100644
99
--- a/src/main/java/org/bukkit/scoreboard/Team.java
1010
+++ b/src/main/java/org/bukkit/scoreboard/Team.java
11-
@@ -325,6 +325,60 @@ public interface Team {
11+
@@ -323,6 +323,60 @@ public interface Team {
1212
*/
1313
void addEntry(@NotNull String entry) throws IllegalStateException, IllegalArgumentException;
1414

@@ -69,7 +69,7 @@ index 51205a71d243195fdf35515374a1e9ef5df26bc0..0f5c49d41c9460da0ba913b4ca8bef37
6969
/**
7070
* Removes the player from this team.
7171
*
72-
@@ -347,6 +401,56 @@ public interface Team {
72+
@@ -345,6 +399,56 @@ public interface Team {
7373
*/
7474
boolean removeEntry(@NotNull String entry) throws IllegalStateException, IllegalArgumentException;
7575

0 commit comments

Comments
 (0)