Make sure to mention spawner in CHECK_SPAWN is nullable

KubeJS-Mods · Jan 26, 2024 · 546bcdb · 546bcdb
1 parent df234fa
commit 546bcdb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/common/src/main/java/dev/latvian/mods/kubejs/entity/CheckLivingEntitySpawnEventJS.java b/common/src/main/java/dev/latvian/mods/kubejs/entity/CheckLivingEntitySpawnEventJS.java
@@ -7,6 +7,7 @@
 import net.minecraft.world.entity.MobSpawnType;
 import net.minecraft.world.level.BaseSpawner;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.Nullable;
 
 @Info("""
 	Invoked before an entity is spawned into the world.
@@ -19,9 +20,11 @@ public class CheckLivingEntitySpawnEventJS extends LivingEntityEventJS {
 
 	public final double x, y, z;
 	public final MobSpawnType type;
+
+	@Nullable
 	public final BaseSpawner spawner;
 
-	public CheckLivingEntitySpawnEventJS(LivingEntity entity, Level level, double x, double y, double z, MobSpawnType type, BaseSpawner spawner) {
+	public CheckLivingEntitySpawnEventJS(LivingEntity entity, Level level, double x, double y, double z, MobSpawnType type, @Nullable BaseSpawner spawner) {
 		this.entity = entity;
 		this.level = level;
 		this.x = x;
@@ -53,7 +56,8 @@ public MobSpawnType getType() {
 		return type;
 	}
 
-	@Info("The spawner that spawned the entity.")
+	@Info("The spawner that spawned the entity. Can be null if the entity was spawned by worldgen.")
+	@Nullable
 	public BaseSpawner getSpawner() {
 		return spawner;
 	}

diff --git a/common/src/main/java/dev/latvian/mods/kubejs/entity/KubeJSEntityEventHandler.java b/common/src/main/java/dev/latvian/mods/kubejs/entity/KubeJSEntityEventHandler.java
@@ -11,6 +11,7 @@
 import net.minecraft.world.level.BaseSpawner;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
+import org.jetbrains.annotations.Nullable;
 
 public class KubeJSEntityEventHandler {
 	public static void init() {
@@ -20,7 +21,7 @@ public static void init() {
 		EntityEvent.ADD.register(KubeJSEntityEventHandler::entitySpawned);
 	}
 
-	private static EventResult checkSpawn(LivingEntity entity, LevelAccessor la, double x, double y, double z, MobSpawnType type, BaseSpawner spawner) {
+	private static EventResult checkSpawn(LivingEntity entity, LevelAccessor la, double x, double y, double z, MobSpawnType type, @Nullable BaseSpawner spawner) {
 		if (la instanceof Level level && (la.isClientSide() || UtilsJS.staticServer != null) && EntityEvents.CHECK_SPAWN.hasListeners()) {
 			return EntityEvents.CHECK_SPAWN.post(level, entity.getType(), new CheckLivingEntitySpawnEventJS(entity, level, x, y, z, type, spawner)).arch();
 		}