From bd8fa92266063ad4ab01d1f091261f15241c2b2c Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sat, 26 Sep 2015 16:06:54 -0700 Subject: [PATCH] Adding a null check in AlleleEffectSpawnMobWeighted. Preferred syntax to PR from #87. --- .../effect/AlleleEffectSpawnMobWeighted.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java index 7173214..98fc090 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java @@ -48,17 +48,19 @@ public class AlleleEffectSpawnMobWeighted extends AlleleEffect { for (int i = 0; i < this.spawnChance.length && !flag; ++i) { roll = 100 - w.rand.nextInt(100) + 1; if (roll < this.spawnChance[i]) { - flag = true; Entity mob = EntityList.createEntityByName(this.entityNames[i], w); - double[] coords = this.randomMobSpawnCoords(w, genome, housing); - - mob.setPositionAndRotation(coords[0], coords[1], coords[2], w.rand.nextFloat() * 360f, 0f); - if (mob instanceof EntityLiving) { - if (((EntityLiving) mob).getCanSpawnHere()) { + if (mob != null) { + flag = true; + double[] coords = this.randomMobSpawnCoords(w, genome, housing); + + mob.setPositionAndRotation(coords[0], coords[1], coords[2], w.rand.nextFloat() * 360f, 0f); + if (mob instanceof EntityLiving) { + if (((EntityLiving) mob).getCanSpawnHere()) { + w.spawnEntityInWorld(mob); + } + } else { w.spawnEntityInWorld(mob); } - } else { - w.spawnEntityInWorld(mob); } } }