upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-13 08:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a smarter fake player check to the Gaia Guardian.

Browse Source
This commit is contained in:
Lizbeth Rika committed 2015-02-02 17:44:50 +00:00
1 parent 4e01cf5623
commit d37dd7d935
1 file changed
+14 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java
+14 -1
View File
@@ -243,10 +243,23 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
@Override
public boolean attackEntityFrom(DamageSource par1DamageSource, float par2) {
if((par1DamageSource.damageType.equals("player") || par1DamageSource.getEntity() instanceof EntityPixie) && par1DamageSource.getEntity() != null && !(par1DamageSource.getEntity() instanceof FakePlayer) && getInvulTime() == 0)
if((par1DamageSource.damageType.equals("player") || par1DamageSource.getEntity() instanceof EntityPixie) && par1DamageSource.getEntity() != null && !(isTruePlayer(par1DamageSource.getEntity())) && getInvulTime() == 0)
return super.attackEntityFrom(par1DamageSource, par2 * (isHardMode() ? 0.6F : 1F));
return false;
}
public boolean isTruePlayer(Entity e) {
if(e instanceof EntityPlayer)
return false;
if(worldObj.isRemote)
return true;
EntityPlayer player = (EntityPlayer) e;
String name = player.getCommandSenderName();
return !(player instanceof FakePlayer || name.contains("[CoFH]") || name.contains("[Thaumcraft"));
}
@Override
protected void damageEntity(DamageSource par1DamageSource, float par2) {