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

Exclude creative, spectator, and dead entities from the black hold and shield effects

Browse source
This commit is contained in:
Sollace 2022-01-01 17:23:06 +02:00
parent de27a543f5
commit 7738f01d3a
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DarkVortexSpell.java
View file

@ -17,10 +17,12 @@ import com.minelittlepony.unicopia.util.shape.Sphere;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.FallingBlockEntity; import net.minecraft.entity.FallingBlockEntity;
import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.damage.DamageSource;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.projectile.PersistentProjectileEntity; import net.minecraft.entity.projectile.PersistentProjectileEntity;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.particle.ParticleTypes; import net.minecraft.particle.ParticleTypes;
import net.minecraft.predicate.entity.EntityPredicates;
import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents; import net.minecraft.sound.SoundEvents;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -89,7 +91,7 @@ public class DarkVortexSpell extends AttractiveSpell {
@Override @Override
protected boolean isValidTarget(Caster<?> source, Entity entity) { protected boolean isValidTarget(Caster<?> source, Entity entity) {
return getAttractiveForce(source, entity) > 0; return EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR.test(entity) && getAttractiveForce(source, entity) > 0;
} }
@Override @Override
@ -138,13 +140,13 @@ public class DarkVortexSpell extends AttractiveSpell {
double radius = getEventHorizonRadius(); double radius = getEventHorizonRadius();
if (radius > 5) { if (radius > 2) {
Vec3d origin = getOrigin(source); Vec3d origin = getOrigin(source);
PosHelper.getAllInRegionMutable(source.getOrigin(), new Sphere(false, radius)).forEach(i -> { PosHelper.getAllInRegionMutable(source.getOrigin(), new Sphere(false, radius)).forEach(i -> {
if (!canAffect(source, i)) { if (!canAffect(source, i)) {
return; return;
} }
if (source.getOrigin().isWithinDistance(i, getEventHorizonRadius())) { if (source.getOrigin().isWithinDistance(i, getEventHorizonRadius() / 2)) {
source.getWorld().breakBlock(i, false); source.getWorld().breakBlock(i, false);
} else { } else {
CatapultSpell.createBlockEntity(source.getWorld(), i, e -> { CatapultSpell.createBlockEntity(source.getWorld(), i, e -> {
@ -194,6 +196,7 @@ public class DarkVortexSpell extends AttractiveSpell {
} }
if (distance <= getEventHorizonRadius()) { if (distance <= getEventHorizonRadius()) {
target.setVelocity(target.getVelocity().multiply(distance / (2 * radius)));
if (target instanceof MagicProjectileEntity) { if (target instanceof MagicProjectileEntity) {
Item item = ((MagicProjectileEntity)target).getStack().getItem(); Item item = ((MagicProjectileEntity)target).getStack().getItem();
@ -209,6 +212,9 @@ public class DarkVortexSpell extends AttractiveSpell {
accumulatedMass += getMass(target); accumulatedMass += getMass(target);
setDirty(); setDirty();
target.damage(MagicalDamageSource.create("black_hole"), Integer.MAX_VALUE); target.damage(MagicalDamageSource.create("black_hole"), Integer.MAX_VALUE);
if (!(target instanceof PlayerEntity)) {
target.discard();
}
source.subtractEnergyCost(-getMass(target) * 10); source.subtractEnergyCost(-getMass(target) * 10);

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TargetSelecter.java
View file

@ -34,7 +34,7 @@ public class TargetSelecter {
boolean ownerIsValid = spell.isFriendlyTogether(source) && (EquinePredicates.PLAYER_UNICORN.test(owner)); boolean ownerIsValid = spell.isFriendlyTogether(source) && (EquinePredicates.PLAYER_UNICORN.test(owner));
return source.findAllEntitiesInRange(radius) return source.findAllEntitiesInRange(radius)
.filter(entity -> !entity.isRemoved()) .filter(entity -> entity.isAlive() && !entity.isRemoved())
.filter(entity -> { .filter(entity -> {
boolean hasShield = SpellPredicate.IS_SHIELD_LIKE.isOn(entity); boolean hasShield = SpellPredicate.IS_SHIELD_LIKE.isOn(entity);
boolean isOwnerOrFriend = Pony.equal(entity, owner) || owner.isConnectedThroughVehicle(entity) || FriendshipBraceletItem.isComrade(source, entity); boolean isOwnerOrFriend = Pony.equal(entity, owner) || owner.isConnectedThroughVehicle(entity) || FriendshipBraceletItem.isComrade(source, entity);