Leahnaya/FairyFactions
1
0
Fork 0
mirror of https://github.com/allaryin/FairyFactions.git synced 2026-09-08 02:15:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Looking over effects of difficulty settings

Browse Source
This commit is contained in:
Ammon Lauritzen
2016-02-23 16:20:40 -06:00
parent 9dabe38b76
commit a12875f304
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/fairies/entity/EntityFairy.java
View File

@@ -696,7 +696,8 @@ public class EntityFairy extends EntityAnimal {
}
}
if (worldObj.difficultySetting.getDifficultyId() <= 0
// fairies run away from players in peaceful
if (worldObj.difficultySetting == EnumDifficulty.PEACEFUL
&& entityToAttack != null
&& entityToAttack instanceof EntityPlayer) {
setEntityFear(entityToAttack);
@@ -2410,6 +2411,7 @@ public class EntityFairy extends EntityAnimal {
}
}
} else {
// faction members can be tamed in peaceful
if (( getFaction() == 0
|| worldObj.difficultySetting == EnumDifficulty.PEACEFUL )
&& !( ( queen() || posted() ) && tamed() ) && !crying()
@@ -2908,15 +2910,6 @@ public class EntityFairy extends EntityAnimal {
}
public void applyPoison(EntityLiving entityliving) {
int effect = rand.nextInt(3);
if (effect == 0) {
effect = Potion.poison.id;
} else if (effect == 1) {
effect = Potion.weakness.id;
} else {
effect = Potion.blindness.id;
}
byte duration = 0;
switch (worldObj.difficultySetting) {
case NORMAL:
@@ -2925,12 +2918,23 @@ public class EntityFairy extends EntityAnimal {
case HARD:
duration = 15;
break;
case PEACEFUL:
case EASY:
default:
// no poison in peaceful or normal
return;
}
if (duration > 0) {
( entityliving ).addPotionEffect(
new PotionEffect(effect, duration * 20, 0));
int effect = rand.nextInt(3);
if (effect == 0) {
effect = Potion.poison.id;
} else if (effect == 1) {
effect = Potion.weakness.id;
} else {
effect = Potion.blindness.id;
}
entityliving.addPotionEffect(new PotionEffect(effect, duration * 20, 0));
healTime = 100 + rand.nextInt(100);
setTarget((Entity) null);