From 52128123efc81769d1f36c0aa5b27b6226f0f0b2 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Tue, 17 Dec 2013 11:41:23 -0800 Subject: [PATCH] Shadow on tempus aspect Config option to switch off otherworld hives spawning in magic biomes. --- .../magicbees/textures/aspects/tempus.png | Bin 4394 -> 3392 bytes magicbees_res/changelog.txt | 5 +++++ .../bees/AlleleEffectSpawnMobWeighted.java | 2 +- magicbees_src/magicbees/main/Config.java | 5 +++++ .../magicbees/main/utils/CraftingManager.java | 3 +++ .../magicbees/world/WorldTicker.java | 2 +- .../magicbees/world/feature/FeatureHive.java | 4 ++-- 7 files changed, 17 insertions(+), 4 deletions(-) diff --git a/magicbees_res/assets/magicbees/textures/aspects/tempus.png b/magicbees_res/assets/magicbees/textures/aspects/tempus.png index d04da058b242972ee0612f118e5a8c04653fbdd5..46ce5f54e4e06f4ea181bf91c986448da92e1395 100644 GIT binary patch literal 3392 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 literal 4394 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 chunkList = chunkRegenList.get(dimensionID); - if (chunkList != null && chunkList.size() > 0) + if (chunkList != null && chunkList.peekFirst() != null) { ChunkCoords coords = chunkList.removeFirst(); diff --git a/magicbees_src/magicbees/world/feature/FeatureHive.java b/magicbees_src/magicbees/world/feature/FeatureHive.java index 9eb7b07..6b4a456 100644 --- a/magicbees_src/magicbees/world/feature/FeatureHive.java +++ b/magicbees_src/magicbees/world/feature/FeatureHive.java @@ -153,7 +153,7 @@ public class FeatureHive netherQuartzGen.generateVein(world, random, coordX, coordY, coordZ - 1, 4); } } - else + else if (MagicBees.getConfig().DoSpecialHiveGen) { int coordY = random.nextInt(13) + 5; @@ -216,7 +216,7 @@ public class FeatureHive } } } - else + else if (MagicBees.getConfig().DoSpecialHiveGen) { // 1 per gen int coordY = random.nextInt(5) + 5;