fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Electroblob
2018-02-23 12:40:03 +00:00
parent d4c9242b14
commit 11af545bd2
3 changed files with 6 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/util/WizardryUtilities.java
+4 -8
View File
@@ -981,24 +981,20 @@ public final class WizardryUtilities {
}else if(target instanceof ISummonedCreature){
// Tests whether the target is a creature that was summoned by an ally of the attacker
if(((ISummonedCreature)target).getCaster() instanceof EntityPlayer
&& WizardData.get((EntityPlayer)attacker)
if(((ISummonedCreature)target).getCaster() instanceof EntityPlayer && WizardData.get((EntityPlayer)attacker)
.isPlayerAlly((EntityPlayer)((ISummonedCreature)target).getCaster())){
return false;
}
}else if(target instanceof EntityLiving
&& ((EntityLivingBase)target).isPotionActive(WizardryPotions.mind_control)){
}else if(target instanceof EntityLiving && ((EntityLivingBase)target).isPotionActive(WizardryPotions.mind_control)){
// Tests whether the target is a creature that was mind controlled by an ally of the attacker
NBTTagCompound entityNBT = target.getEntityData();
if(entityNBT != null && entityNBT.hasKey(MindControl.NBT_KEY)){
Entity controller = WizardryUtilities.getEntityByUUID(target.world,
entityNBT.getUniqueId(MindControl.NBT_KEY));
Entity controller = WizardryUtilities.getEntityByUUID(target.world, entityNBT.getUniqueId(MindControl.NBT_KEY));
if(controller instanceof EntityPlayer
&& WizardData.get((EntityPlayer)attacker).isPlayerAlly((EntityPlayer)controller)){
if(controller instanceof EntityPlayer && WizardData.get((EntityPlayer)attacker).isPlayerAlly((EntityPlayer)controller)){
return false;
}
}