move safe spawn pos function and use it for bunny dismount logic

Author: demonlexe

src/main/java/drzhark/mocreatures/MoCTools.java

@@ -140,6 +140,29 @@ public static BlockPos getActualTopSolidOrLiquidBlock(World world, BlockPos pos)
         return blockPos;
     }
 
+    /**
+     * Finds a safe location to put entities when they are dismounted from a player's head, or being spawned into the world through other means.
+     */
+    public static BlockPos getSafeMobPos(EntityLivingBase entity, BlockPos near, Boolean addHeight) {
+        int radius = 6;
+        int maxTries = 24;
+        BlockPos testing;
+        for (int i = 0; i < maxTries; i++) {
+            int x = near.getX() + entity.getEntityWorld().rand.nextInt(radius * 2) - radius;
+            int z = near.getZ() + entity.getEntityWorld().rand.nextInt(radius * 2) - radius;
+            int y = entity.getEntityWorld().getHeight(x, z) + (addHeight ? 16 : 0);
+            testing = new BlockPos(x, y, z);
+            while (entity.getEntityWorld().isAirBlock(testing) && testing.getY() > 0) {
+                testing = testing.down(1);
+            }
+            IBlockState iblockstate = entity.getEntityWorld().getBlockState(testing);
+            if (iblockstate.canEntitySpawn(entity)) {
+                return testing.up(1);
+            }
+        }
+        return null;
+    }
+
     /**
      * spawns tiny slimes
      */
@@ -1228,7 +1251,15 @@ public static void dismountPassengerFromEntity(Entity passenger, Entity entity,
         if (force || (passenger instanceof EntityLivingBase && entity.isSneaking())) {
             System.out.println("Forcing dismount from " + entity + " for passenger " + passenger);
             passenger.dismountRidingEntity();
-            passenger.setPositionAndUpdate(entity.posX, entity.posY + 1D, entity.posZ);
+            double dist = (-1.5D);
+            double newPosX = entity.posX + (dist * Math.sin(((EntityLivingBase) entity).renderYawOffset / 57.29578F));
+            double newPosZ = entity.posZ - (dist * Math.cos(((EntityLivingBase) entity).renderYawOffset / 57.29578F));
+            BlockPos safeSpawnPos = getSafeMobPos((EntityLivingBase) passenger, new BlockPos(newPosX, entity.posY, newPosZ), false);
+            if (safeSpawnPos != null) {
+                passenger.setPositionAndUpdate(safeSpawnPos.getX(), safeSpawnPos.getY() + 1D, safeSpawnPos.getZ());
+            } else {
+                passenger.setPositionAndUpdate(entity.posX, entity.posY + 1D, entity.posZ);
+            }
             MoCTools.playCustomSound(passenger, SoundEvents.ENTITY_CHICKEN_EGG);
             if (entity instanceof EntityPlayer) {
                 NBTTagCompound tag = entity.getEntityData();

src/main/java/drzhark/mocreatures/event/MoCEventHooks.java

@@ -70,7 +70,7 @@ public void onPopulateVillage(PopulateChunkEvent.Post event) {
             if (event.getRand().nextInt(100) < MoCreatures.proxy.kittyVillageChance) {
                 BlockPos pos = new BlockPos(event.getChunkX() * 16, 100, event.getChunkZ() * 16);
                 MoCEntityKitty kitty = new MoCEntityKitty(world);
-                BlockPos spawnPos = getSafeSpawnPos(kitty, pos.add(8, 0, 8));
+                BlockPos spawnPos = MoCTools.getSafeMobPos(kitty, pos.add(8, 0, 8), true);
                 if (spawnPos == null || !WorldEntitySpawner.canCreatureTypeSpawnAtLocation(EntityLiving.SpawnPlacementType.ON_GROUND, world, spawnPos))
                     return;
                 kitty.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(kitty)), null);
@@ -135,24 +135,4 @@ public void onPlayerLogout(PlayerEvent.PlayerLoggedOutEvent event) {
             }
         }
     }
-
-    private BlockPos getSafeSpawnPos(EntityLivingBase entity, BlockPos near) {
-        int radius = 6;
-        int maxTries = 24;
-        BlockPos testing;
-        for (int i = 0; i < maxTries; i++) {
-            int x = near.getX() + entity.getEntityWorld().rand.nextInt(radius * 2) - radius;
-            int z = near.getZ() + entity.getEntityWorld().rand.nextInt(radius * 2) - radius;
-            int y = entity.getEntityWorld().getHeight(x, z) + 16;
-            testing = new BlockPos(x, y, z);
-            while (entity.getEntityWorld().isAirBlock(testing) && testing.getY() > 0) {
-                testing = testing.down(1);
-            }
-            IBlockState iblockstate = entity.getEntityWorld().getBlockState(testing);
-            if (iblockstate.canEntitySpawn(entity)) {
-                return testing.up(1);
-            }
-        }
-        return null;
-    }
 }