2022-02-12 19:44:54 +00:00
|
|
|
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
|
2022-06-10 14:11:41 +00:00
|
|
|
index 5f7a77ec7047d2fb0bc64608e0e74a7e524c93c9..4e5cdd103758c5c17467a72dcaee837d7dbf4b8e 100644
|
2022-02-12 19:44:54 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-06-09 08:51:45 +00:00
|
|
|
@@ -2138,6 +2138,8 @@ public final class CraftServer implements Server {
|
2022-02-12 19:44:54 +00:00
|
|
|
@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) {
|
