Merge branch 'master' of https://github.com/ted80/BiomesOPlenty

src/minecraft/biomesoplenty/biomes/BiomeGenBog.java

@@ -38,7 +38,6 @@ public class BiomeGenBog extends BiomeGenBase
         this.customBiomeDecorator.mudPerChunk2 = 5;
         this.customBiomeDecorator.deadBushPerChunk = 5;
 		this.customBiomeDecorator.algaePerChunk = 2;
-        this.spawnableCreatureList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
         this.waterColorMultiplier = 11506176;
     }
 

src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java

@@ -37,7 +37,6 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
 		this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();
 		this.waterColorMultiplier = 10661201;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
     }
 
     /**

src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java

@@ -31,7 +31,6 @@ public class BiomeGenQuagmire extends BiomeGenBase
         this.customBiomeDecorator.sandPerChunk2 = -999;
         this.waterColorMultiplier = 13390080;
 		this.customBiomeDecorator.generateQuagmire = true;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
     }
 	
     /**

src/minecraft/biomesoplenty/configuration/BOPEntities.java

@@ -51,13 +51,18 @@ public class BOPEntities {
 		
 		registerEntityEgg(EntityJungleSpider.class, 5147192, 11013646);
 		registerEntityEgg(EntityRosester.class, 14831439, 16756224);
-		registerEntityEgg(EntityGlob.class, 14831439, 16756224);
+		registerEntityEgg(EntityGlob.class, 6836276, 8414787);
 		
 		if (Biomes.jungleNew.isPresent() && Biomes.tropicalRainforest.isPresent() && Biomes.oasis.isPresent() && Biomes.tropics.isPresent())
 		{
 			EntityRegistry.addSpawn(EntityJungleSpider.class, 8, 1, 3, EnumCreatureType.monster, Biomes.jungleNew.get(), Biomes.tropicalRainforest.get(), Biomes.oasis.get(), Biomes.tropics.get());
 		}
 		
+		if (Biomes.bog.isPresent() && Biomes.deadSwamp.isPresent() && Biomes.fen.isPresent() && Biomes.moor.isPresent() && Biomes.quagmire.isPresent() && Biomes.swamplandNew.isPresent())
+		{
+			EntityRegistry.addSpawn(EntityJungleSpider.class, 1, 1, 1, EnumCreatureType.creature, Biomes.bog.get(), Biomes.deadSwamp.get(), Biomes.fen.get(), Biomes.moor.get(), Biomes.quagmire.get(), Biomes.swamplandNew.get());
+		}
+
 		if (Biomes.garden.isPresent())
 		{
 			EntityRegistry.addSpawn(EntityRosester.class, 10, 2, 4, EnumCreatureType.creature, Biomes.garden.get());

src/minecraft/biomesoplenty/mobs/EntityGlob.java

@@ -276,7 +276,7 @@ public class EntityGlob extends EntityLiving implements IMob
      */
     protected int getDropItemId()
     {
-        return this.getGlobSize() == 1 ? Items.mudball.get().itemID : 0;
+        return this.getGlobSize() == 1 ? Item.slimeBall.itemID : Items.mudball.get().itemID;
     }
 
     /**