mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 20:52:20 +00:00
Merge branch 'master' into flattening_test
This commit is contained in:
commit
58fa185ef4
17 files changed
+110
-128
No files matched your search
@@ -687,7 +687,8 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss {
|
||||
if (world.isRemote) {
|
||||
particles();
|
||||
EntityPlayer player = Botania.proxy.getClientPlayer();
|
||||
player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode;
|
||||
if(getPlayersAround().contains(player))
|
||||
player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -813,8 +814,6 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss {
|
||||
if(spawnMissiles)
|
||||
spawnMissile();
|
||||
} else {
|
||||
float range = 3F;
|
||||
players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range));
|
||||
if(!players.isEmpty())
|
||||
damageEntity(DamageSource.causePlayerDamage(players.get(0)), 0);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user