Suppress errors due to failed getEntitySpawnReason implementation (#4334

) fix: suppress errors due to failed getEntitySpawnReason implementation
IntellectualSites · Feb 12, 2024 · d9537ee · d9537ee
1 parent 0de6887
commit d9537ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@@ -779,7 +779,8 @@ private void runEntityTask() {
  Iterator<Entity> iterator = entities.iterator();
  while (iterator.hasNext()) {
  Entity entity = iterator.next();
- if (PaperLib.isPaper() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
+ //noinspection ConstantValue - getEntitySpawnReason annotated as NotNull, but is not NotNull. lol.
+ if (PaperLib.isPaper() && entity.getEntitySpawnReason() != null && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
  continue;
  }
  // Fallback for Spigot not having Entity#getEntitySpawnReason

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
@@ -124,7 +124,8 @@ public void creatureSpawnEvent(EntitySpawnEvent event) {
  return;
  }
  if (PaperLib.isPaper()) {
- if (area.isSpawnCustom() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
+ //noinspection ConstantValue - getEntitySpawnReason annotated as NotNull, but is not NotNull. lol.
+ if (area.isSpawnCustom() && entity.getEntitySpawnReason() != null && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
  return;
  }
  }