mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-08 04:34:56 +02:00
21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
||
|
|
Date: Sat, 12 Feb 2022 12:40:50 -0700
|
||
|
|
Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
|
||
|
|
|
||
|
|
Copies appropriate checks from CraftWorld#getSpawnLimit
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
index ff5c06e261945bbd7730662cdb79167f160c661e..f0629cac377b29246e990a01d60601270cbd77bd 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
@@ -2153,6 +2153,8 @@ public final class CraftServer implements Server {
|
||
|
|
@Override
|
||
|
|
public int getSpawnLimit(SpawnCategory spawnCategory) {
|
||
|
|
// Paper start
|
||
|
|
+ Validate.notNull(spawnCategory, "SpawnCategory cannot be null");
|
||
|
|
+ Validate.isTrue(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory." + spawnCategory + " does not have a spawn limit.");
|
||
|
|
return this.getSpawnLimitUnsafe(spawnCategory);
|
||
|
|
}
|
||
|
|
public int getSpawnLimitUnsafe(final SpawnCategory spawnCategory) {
|