Fixed a bug where more crystals would spawn too low

Insane96 · Dec 22, 2020 · 119a6cb · 119a6cb
1 parent 821d5d8
commit 119a6cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/insane96mcp/progressivebosses/events/entities/Dragon.java b/src/main/java/insane96mcp/progressivebosses/events/entities/Dragon.java
@@ -186,16 +186,18 @@ private static void moreCrystals(EnderDragonEntity dragon, float killedCount) {
 
 		for (EnderCrystalEntity crystal : crystals) {
 			BlockPos crystalPos = new BlockPos(crystal.getPosX(), crystal.getPosY() - 16, crystal.getPosZ());
+			if (crystalPos.getY() < centerPodium.getY())
+				crystalPos = new BlockPos(crystalPos.getX(), centerPodium.getY(), crystalPos.getZ());
 
 			Stream<BlockPos> blocks = BlockPos.getAllInBox(crystalPos.add(-1, -1, -1), crystalPos.add(1, 1, 1));
 
 			blocks.forEach(pos -> dragon.world.setBlockState(pos, Blocks.AIR.getDefaultState()));
-			dragon.world.setBlockState(crystalPos.add(0, -1, 0), Blocks.OBSIDIAN.getDefaultState());
+			dragon.world.setBlockState(crystalPos.add(0, -1, 0), Blocks.BEDROCK.getDefaultState());
 
 			dragon.world.createExplosion(dragon, crystalPos.getX() + .5f, crystalPos.getY(), crystalPos.getZ() + .5, 5f, Explosion.Mode.DESTROY);
 
 			EnderCrystalEntity newCrystal = new EnderCrystalEntity(dragon.world, crystalPos.getX() + .5, crystalPos.getY(), crystalPos.getZ() + .5);
-			newCrystal.setShowBottom(false);
+			//newCrystal.setShowBottom(false);
 			dragon.world.addEntity(newCrystal);
 
 			crystalSpawned++;

diff --git a/src/main/java/insane96mcp/progressivebosses/events/entities/Wither.java b/src/main/java/insane96mcp/progressivebosses/events/entities/Wither.java
@@ -361,7 +361,7 @@ private static void spawnSkeletons(WitherEntity wither, World world) {
 		}
 	}
 
-	private static final Predicate<LivingEntity> NOT_UNDEAD = livingEntity -> livingEntity instanceof LivingEntity && livingEntity.getCreatureAttribute() != CreatureAttribute.UNDEAD && livingEntity.attackable();
+	private static final Predicate<LivingEntity> NOT_UNDEAD = livingEntity -> livingEntity != null && livingEntity.getCreatureAttribute() != CreatureAttribute.UNDEAD && livingEntity.attackable();
 
 	/*
 	 * Check if the mob has space to spawn and if sits on solid ground
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
-    	private static final Predicate<LivingEntity> NOT_UNDEAD = livingEntity -> livingEntity instanceof LivingEntity && livingEntity.getCreatureAttribute() != CreatureAttribute.UNDEAD && livingEntity.attackable();
+    	private static final Predicate<LivingEntity> NOT_UNDEAD = livingEntity -> livingEntity != null && livingEntity.getCreatureAttribute() != CreatureAttribute.UNDEAD && livingEntity.attackable();
     	/*
     	 * Check if the mob has space to spawn and if sits on solid ground
@@ Expand Down @@