mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-29 23:09:33 +01:00
9147456fc9
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: ab8ace685 SPIGOT-7236: Bone meal doesn't increase use statistic 7dcb59b8e Avoid switch on material in previous commit Spigot Changes: 19641c75 SPIGOT-7235: World.Spigot#strikeLightningEffect doesn't do anything
20 lines
975 B
Diff
20 lines
975 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 18d5a26c34c848241c306241b3ad9825b5a0b9a9..60b1cffdccde4715832546d6edbf206fbab4e82f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
|
|
@@ -261,7 +261,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 = this.checkState();
|
|
|