74f507f4e3
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: e461dcfe #555: Item - add getters/setters for owner/thrower CraftBukkit Changes: 055870c4 #758: Item - add getters/setters for owner/thrower
20 lines
970 B
Diff
20 lines
970 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
|
|
Date: Sun, 30 Aug 2020 15:30:29 +0800
|
|
Subject: [PATCH] Fix CraftTeam null check
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
|
|
index 0fba3d2a8d3bd7ec615d137e4625a7f357729d8d..0315ea5ad8dcccf067e5419e2387e497b29bccb1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
|
|
@@ -203,7 +203,7 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
|
|
|
|
@Override
|
|
public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
|
|
- Validate.notNull("Entry cannot be null");
|
|
+ Validate.notNull(entry, "Entry cannot be null"); // Paper
|
|
|
|
CraftScoreboard scoreboard = checkState();
|
|
|