2022-02-12 20:44:54 +01: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-11-03 22:03:31 +01:00
|
|
|
index cabcddbf3f3db301a0827767b1f8917d011b8ae7..08b171f08313da411a6ab036851b4435963477f4 100644
|
2022-02-12 20:44:54 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-08-09 09:18:08 +02:00
|
|
|
@@ -2164,6 +2164,8 @@ public final class CraftServer implements Server {
|
2022-02-12 20:44:54 +01: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) {
|