PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-30 16:28:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added pigs to the feedable set of enties, increased the feeding distance, and changed effects on the eaten entity

Browse source
This commit is contained in:
Sollace 2019-02-01 10:39:33 +02:00
parent eaa2790116
commit 1d9f3b3ae3
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/minelittlepony/unicopia/power/PowerFeed.java
View file

@ -14,6 +14,7 @@ import com.minelittlepony.util.vector.VecHelper;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.EnumCreatureType;
import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityCow;
import net.minecraft.entity.passive.EntityPig;
import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -53,7 +54,7 @@ public class PowerFeed implements IPower<Hit> {
@Override @Override
public Hit tryActivate(EntityPlayer player, World w) { public Hit tryActivate(EntityPlayer player, World w) {
if (player.getHealth() < player.getMaxHealth() || player.canEat(false)) { if (player.getHealth() < player.getMaxHealth() || player.canEat(false)) {
Entity i = VecHelper.getLookedAtEntity(player, 10); Entity i = VecHelper.getLookedAtEntity(player, 15);
if (i != null && canDrain(i)) { if (i != null && canDrain(i)) {
return new Hit(); return new Hit();
} }
@ -67,6 +68,7 @@ public class PowerFeed implements IPower<Hit> {
|| e instanceof EntityVillager || e instanceof EntityVillager
|| e instanceof EntityPlayer || e instanceof EntityPlayer
|| e instanceof EntitySheep || e instanceof EntitySheep
|| e instanceof EntityPig
|| EnumCreatureType.MONSTER.getCreatureClass().isAssignableFrom(e.getClass()); || EnumCreatureType.MONSTER.getCreatureClass().isAssignableFrom(e.getClass());
} }
@ -79,7 +81,7 @@ public class PowerFeed implements IPower<Hit> {
public void apply(EntityPlayer player, Hit data) { public void apply(EntityPlayer player, Hit data) {
List<Entity> list = VecHelper.getWithinRange(player, 3, this::canDrain); List<Entity> list = VecHelper.getWithinRange(player, 3, this::canDrain);
Entity looked = VecHelper.getLookedAtEntity(player, 10); Entity looked = VecHelper.getLookedAtEntity(player, 17);
if (looked != null && !list.contains(looked)) { if (looked != null && !list.contains(looked)) {
list.add(looked); list.add(looked);
} }
@ -93,7 +95,7 @@ public class PowerFeed implements IPower<Hit> {
for (Entity i : list) { for (Entity i : list) {
DamageSource d = MagicalDamageSource.causePlayerDamage("feed", player); DamageSource d = MagicalDamageSource.causePlayerDamage("feed", player);
if (EnumCreatureType.CREATURE.getCreatureClass().isAssignableFrom(i.getClass()) || player.world.rand.nextFloat() > 0.95f) { if (player.world.rand.nextFloat() > 0.95f) {
i.attackEntityFrom(d, Integer.MAX_VALUE); i.attackEntityFrom(d, Integer.MAX_VALUE);
} else { } else {
i.attackEntityFrom(d, drained); i.attackEntityFrom(d, drained);
@ -111,9 +113,7 @@ public class PowerFeed implements IPower<Hit> {
player.addPotionEffect(new PotionEffect(MobEffects.WITHER, 20, 1)); player.addPotionEffect(new PotionEffect(MobEffects.WITHER, 20, 1));
} }
if (player.world.rand.nextFloat() > 0.4f) { player.removePotionEffect(MobEffects.NAUSEA);
player.removePotionEffect(MobEffects.NAUSEA);
}
} }
} }