$ Fixed an error loading the Accelerator Blacklist.

$ Hopefully fixed Limestone not dropping fluorite as often as it should.

2 files changed, 12 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index e61ff15c06..1f14513fb8 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -2,6 +2,7 @@ package gtPlusPlus;
 
 import static gtPlusPlus.core.lib.CORE.DEBUG;
 import static gtPlusPlus.core.lib.CORE.configSwitches.*;
+import static gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -162,9 +163,10 @@ public class GTplusplus implements ActionListener {
 		CORE.DARKBIOME_ID = config.getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension.");
 
 		//Blacklisted Accelerator TileEntities
-		GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames = config.getStringList(
+		BlacklistedTileEntiyClassNames = new String[] { "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry" };
+		BlacklistedTileEntiyClassNames = config.getStringList(
 				"BlacklistedTileEntiyClassNames", "gregtech",
-				GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames,
+				BlacklistedTileEntiyClassNames,
 				"The Canonical Class-Names of TileEntities that should be ignored by the WorldAccelerator");
 		
 		
diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index 25ec4d98c7..58b5d6e7cc 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -78,7 +78,7 @@ public class BlockEventHandler {
 		//Spawn Dull Shards (Can spawn from Tree Logs, Grass or Stone. Stone going to be the most common source.)
 		if (((event.block == Blocks.stone) || (event.block == Blocks.sandstone) || (event.block == Blocks.log) || (event.block == Blocks.log2) || (event.block == Blocks.grass))
 				&& !LoadedMods.Thaumcraft && (chanceToDropDrainedShard != 0)) {
-			//small chance for one to spawn per stone mined. 1 per 3 stacks~ //TODO MAKE A CONFIG OPTION
+			//small chance for one to spawn per stone mined. 1 per 3 stacks~
 			if (MathUtils.randInt(1, chanceToDropDrainedShard) == 1){
 				//Let's sort out a lucky charm for the player.
 				final int FancyChance = MathUtils.randInt(1, 4);
@@ -129,6 +129,13 @@ public class BlockEventHandler {
 					}
 				}
 			}
+			else {
+				if (event.block.getUnlocalizedName().toLowerCase().contains("limestone")){
+					if (MathUtils.randInt(1, chanceToDropFluoriteOre) == 1){
+						event.drops.add(this.fluoriteOre.copy());
+					}
+				}
+			}
 			if (event.block == Blocks.sandstone){
 				if (MathUtils.randInt(1, chanceToDropFluoriteOre*20) == 1){
 					event.drops.add(this.fluoriteOre.copy());