PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 19:46:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Changelings can now capture players and entities in cuccoons by spraying them with MORE GOO!

Browse source
This commit is contained in:
Sollace 2019-03-12 22:26:41 +02:00
parent 45965746ed
commit cd8d244ea7
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/com/minelittlepony/unicopia/spell/SpellChangelingTrap.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.unicopia.spell; package com.minelittlepony.unicopia.spell;
import com.minelittlepony.unicopia.entity.EntityCuccoon;
import com.minelittlepony.unicopia.entity.IMagicals; import com.minelittlepony.unicopia.entity.IMagicals;
import com.minelittlepony.unicopia.init.UBlocks; import com.minelittlepony.unicopia.init.UBlocks;
import com.minelittlepony.unicopia.init.USounds; import com.minelittlepony.unicopia.init.USounds;
@ -7,6 +8,7 @@ import com.minelittlepony.unicopia.player.PlayerSpeciesList;
import com.minelittlepony.util.WorldEvent; import com.minelittlepony.util.WorldEvent;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
@ -142,8 +144,18 @@ public class SpellChangelingTrap extends AbstractSpell implements ITossedEffect,
return SpellAffinity.BAD; return SpellAffinity.BAD;
} }
public void enforce() { public void enforce(ICaster<?> caster) {
struggleCounter = 10; struggleCounter = 10;
if (caster.isLocal() && caster.getWorld().rand.nextInt(3) == 0) {
setDead();
EntityCuccoon cuccoon = new EntityCuccoon(caster.getWorld());
cuccoon.copyLocationAndAnglesFrom(caster.getEntity());
caster.getWorld().spawnEntity(cuccoon);
}
setDirty(true); setDirty(true);
} }
@ -154,15 +166,21 @@ public class SpellChangelingTrap extends AbstractSpell implements ITossedEffect,
if (existing == null) { if (existing == null) {
e.setEffect(copy()); e.setEffect(copy());
} else { } else {
existing.enforce(); existing.enforce(e);
} }
} }
protected boolean canAffect(Entity e) {
return !(e instanceof IMagicals)
&& e instanceof EntityLivingBase
&& !e.isRiding();
}
@Override @Override
public void onImpact(ICaster<?> caster, BlockPos pos, IBlockState state) { public void onImpact(ICaster<?> caster, BlockPos pos, IBlockState state) {
if (caster.isLocal()) { if (caster.isLocal()) {
caster.findAllEntitiesInRange(5) caster.findAllEntitiesInRange(5)
.filter(e -> !(e instanceof IMagicals) && e instanceof EntityLivingBase) .filter(this::canAffect)
.map(e -> PlayerSpeciesList.instance().getCaster((EntityLivingBase)e)) .map(e -> PlayerSpeciesList.instance().getCaster((EntityLivingBase)e))
.forEach(this::entrap); .forEach(this::entrap);
} }