Dont spawn deactivated mobs

anweisen · Jan 18, 2024 · 13c0c96 · 13c0c96
1 parent dab02be
commit 13c0c96
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/...ingarea/challenges/plugin/challenges/implementation/challenge/MobRandomizerChallenge.java b/...ingarea/challenges/plugin/challenges/implementation/challenge/MobRandomizerChallenge.java
@@ -9,8 +9,10 @@
 import net.codingarea.challenges.plugin.management.menu.MenuType;
 import net.codingarea.challenges.plugin.management.scheduler.task.TimerTask;
 import net.codingarea.challenges.plugin.management.scheduler.timer.TimerStatus;
+import net.codingarea.challenges.plugin.management.server.GameWorldStorage;
 import net.codingarea.challenges.plugin.utils.item.ItemBuilder;
 import net.codingarea.challenges.plugin.utils.misc.ListBuilder;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -65,10 +67,11 @@ public void onPause() {
 	private void loadAllEntities() {
 		for (World world : ChallengeAPI.getGameWorlds()) {
 			for (LivingEntity entity : world.getLivingEntities()) {
-				if (!entityRandomizer.containsKey(entity.getType())) continue;
-				entity.remove();
-				entity.getWorld().spawnEntity(entity.getLocation(), entity.getType());
-
+				Bukkit.getScheduler().runTask(Challenges.getInstance(), () -> {
+					if (!entityRandomizer.containsKey(entity.getType())) return;
+					entity.remove();
+					entity.getWorld().spawnEntity(entity.getLocation(), entityRandomizer.get(entity.getType()));
+				});
 			}
 
 		}
@@ -114,14 +117,21 @@ protected void reloadRandomization() {
 	}
 
 	public List<EntityType> getSpawnAbleEntities() {
-		return new ListBuilder<>(EntityType.values())
+		ListBuilder<EntityType> builder = new ListBuilder<>(EntityType.values())
 				.removeIf(type -> !type.isSpawnable())
 				.removeIf(type -> !type.isAlive())
 				.remove(EntityType.ENDER_DRAGON)
 				.remove(EntityType.WITHER)
 				.remove(EntityType.GIANT)
-				.remove(EntityType.ILLUSIONER)
-				.build();
+				.remove(EntityType.ILLUSIONER);
+
+		try {
+			builder.removeIf(type -> !type.isEnabledByFeature(plugin.getGameWorldStorage().getWorld(World.Environment.NORMAL)));
+		} catch (Exception e) {
+			// OLD VERSION
+		}
+
+		return builder.build();
 	}
 
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
     <properties>
         <utilities.version>1.3.13</utilities.version>
-        <spigot.version>1.19-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
     </properties>
 
 </project>