From 53147606c1b358009f0c32c814127fe6e8fa1530 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 16:48:58 -0500 Subject: [PATCH] GG automatically distributes drops to appropriate players. Also fix mobs getting too short of a fire resist --- .../common/entity/EntityDoppleganger.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 4d168a8d6..e1e207a63 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -467,8 +467,18 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { continue; EntityPlayer saveLastAttacker = this.attackingPlayer; - attackingPlayer = player; + double savePosX = posX; + double savePosY = posY; + double savePosZ = posZ; + + attackingPlayer = player; // Fake attacking player as the killer + posX = player.posX; // Spoof pos so drops spawn at the player + posY = player.posY; + posZ = player.posZ; super.dropLoot(wasRecentlyHit, lootingModifier, DamageSource.causePlayerDamage(player)); + posX = savePosX; + posY = savePosY; + posZ = savePosZ; attackingPlayer = saveLastAttacker; } @@ -570,14 +580,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { int zp = posZInt + k; BlockPos posp = new BlockPos(xp, yp, zp); if(isCheatyBlock(worldObj, posp)) { - Block block = worldObj.getBlockState(posp).getBlock(); - List items = block.getDrops(worldObj, posp, worldObj.getBlockState(posp), 0); - for(ItemStack stack : items) { - if(ConfigHandler.blockBreakParticles) - worldObj.playEvent(2001, posp, Block.getStateId(worldObj.getBlockState(posp))); - worldObj.spawnEntityInWorld(new EntityItem(worldObj, xp + 0.5, yp + 0.5, zp + 0.5, stack)); - } - worldObj.setBlockToAir(posp); + worldObj.destroyBlock(posp, true); } } @@ -674,7 +677,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { if(entity != null) { if(!entity.isImmuneToFire()) - entity.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 30, 0)); + entity.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 600, 0)); range = 6F; entity.setPosition(posX + 0.5 + Math.random() * range - range / 2, posY - 1, posZ + 0.5 + Math.random() * range - range / 2); worldObj.spawnEntityInWorld(entity);