From f370a1291d17602bfd202bf968842e7f1c12d32a Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Tue, 29 Oct 2013 15:31:35 -0400
Subject: [PATCH] Changed how wasp spawners generate

---
 .../biomesoplenty/worldgen/WorldGenHive.java  |  28 ++++++++----------
 .../textures/blocks/hivespawner.png           | Bin 0 -> 756 bytes
 2 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 resources/assets/biomesoplenty/textures/blocks/hivespawner.png

diff --git a/common/biomesoplenty/worldgen/WorldGenHive.java b/common/biomesoplenty/worldgen/WorldGenHive.java
index 0b850f093..336a832bf 100644
--- a/common/biomesoplenty/worldgen/WorldGenHive.java
+++ b/common/biomesoplenty/worldgen/WorldGenHive.java
@@ -68,15 +68,6 @@ public class WorldGenHive extends WorldGenerator
 	
 	public void generateHiveCube(World world, int origx, int origy, int origz, int height, int width, int cubeno, float chance, int honeychance)
 	{
-	    world.setBlock(origx, origy - (height / 2), origz, Block.mobSpawner.blockID);
-
-	    TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner)world.getBlockTileEntity(origx, origy - (height / 2), origz);
-
-	    if (tileentitymobspawner != null)
-	    {
-	        tileentitymobspawner.getSpawnerLogic().setMobID("BiomesOPlenty.Wasp");
-	    }
-
         for (int hLayer = 0; hLayer < height; hLayer++)
         {     
             for (int i = -width; i < width; i++)
@@ -125,15 +116,20 @@ public class WorldGenHive extends WorldGenerator
 	{
 		for (int spawn = 0; spawn < amount; spawn++)
 		{
-			int spawnx = (x - 4) + rand.nextInt(8);
-			int spawny = (y - 6) - rand.nextInt(4);
-			int spawnz = (z - 4) + rand.nextInt(8);
+			int spawnx = (x - 8) + rand.nextInt(16);
+			int spawny = (y + 2) - rand.nextInt(16);
+			int spawnz = (z - 8) + rand.nextInt(16);
 			
-			if (world.isAirBlock(spawnx, spawny, spawnz))
+			if (world.getBlockId(spawnx, spawny, spawnz) == Blocks.hive.get().blockID)
 			{
-				EntityWasp wasp = new EntityWasp(world);
-	            wasp.setLocationAndAngles((double)spawnx, (double)spawny, (double)spawnz, 0.0F, 0.0F);
-	            world.spawnEntityInWorld(wasp);
+			    world.setBlock(spawnx, spawny, spawnz, Block.mobSpawner.blockID);
+
+			    TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner)world.getBlockTileEntity(spawnx, spawny, spawnz);
+
+			    if (tileentitymobspawner != null)
+			    {
+			        tileentitymobspawner.getSpawnerLogic().setMobID("BiomesOPlenty.Wasp");
+			    }
 			}
 		}
 	}
diff --git a/resources/assets/biomesoplenty/textures/blocks/hivespawner.png b/resources/assets/biomesoplenty/textures/blocks/hivespawner.png
new file mode 100644
index 0000000000000000000000000000000000000000..d04b1d83cf3be0604c3f22d343f87854edc408c6
GIT binary patch
literal 756
zcmV<Q0t@|#P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00004XF*Lt006O%
z3;baP00009a7bBm000ib000ib0l1NC?EnA(8gxZibW?9;ba!ELWdKlNX>N2bPDNB8
zb~7$DE-^7j^FlWO00MAHL_t(IPd!rWPf}qVK7T`B`cP}lvYKBg+;rv4vZm8%RLgLU
zGIU)manX>ZrQ<HhMWiGML<l61SyKze8v=oX2qI~=?7A*nx3T#T^thL~J!d=Tx99!6
z&*f0xMy_Qef?*|N-qHNg+wgt#x`?@Jpp72Xmd~onOl>8DqRO=Oe8zTRNM2)mP)>b$
z-l%D&(e~{C!n)IP*6t2wKJeCA?-W)<!-1uE^ykZ)miFU>L*X=e1KznV5jOB+?8aIq
zrPpZ&9k$h{7q>YSwtm`JpPd>9J85PR_CjCPhUao`k47#Pd-w&=8H<J%BEdyt4JEyL
z0IHUroRK#kg2aTW_Pv{BzE>(_<xO^#z?G(Hua$QM)ZY^=-mY2-w~Tbsjl5&=`LN$N
ziYbmkdO8{ZFm%NsC?a<T)F<p6r?w>FfkZg7S<POLYt6x&oAKKREWqbsHemx$oAZFY
zKvH)r^g1naM4Ae@RHs!>D@#+BvxE(MnCA{?ZygSp*%-wP)i!?NV@?5)D`OuV>#2KV
zud}!2`SkVuf-?BYM(<PWtLe;gA{*j^P4>aJTUt%_q1IkbAw(kLf74u)NSRHBVXqr)
z5H<kmgbn-}zx_Hm<90dVa87d)VNe>C5^rB$G!Ztmq6ET5Ma%u?WD=2B*a=IUE3$Sz
zkNP{=+Q%){wa~E)Q6PSNI_~VpooEApMD$@LTDRP#sn~m7iHj&WCi@^=(vXjQ(ExlS
z3^GTI+^U`AeiX3P1Hpvs=t^o4emu{dK1uQR{EweQ*Z{)J9f;^FkYKk$ZZtfC7{r>0
mMM8loSlUdA2^+;H&5Zw`xpQ~gYOg#10000<MNUMnLSTZ0pIDs$

literal 0
HcmV?d00001