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

Fixed raytracing in several places.

Browse source
This commit is contained in:
Sollace 2022-09-11 17:54:55 +02:00
parent ec1a1e8583
commit 021a7f0b3c
7 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/minelittlepony/unicopia/ability/BatPonyHangAbility.java
View file

@ -45,15 +45,6 @@ public class BatPonyHangAbility implements Ability<Multi> {
return new Multi(BlockPos.ZERO, 0);
}
BlockPos poss = RayTraceHelper.doTrace(player.getMaster(), 3, 1, EntityPredicates.CAN_COLLIDE).getBlockPos().orElse(null);
if (poss != null) {
boolean air = player.getReferenceWorld().isAir(poss.down()) && player.getReferenceWorld().isAir(poss.down(2));
if (air && player.canHangAt(poss)) {
return new Multi(poss, 1);
}
}
return RayTraceHelper.doTrace(player.getMaster(), 5, 1, EntityPredicates.EXCEPT_SPECTATOR).getBlockPos()
.map(BlockPos::down)
.filter(pos -> player.getReferenceWorld().isAir(pos) && player.getReferenceWorld().isAir(pos.down()) && player.canHangAt(pos))

2
src/main/java/com/minelittlepony/unicopia/ability/ChangelingDisguiseAbility.java
View file

@ -42,7 +42,7 @@ public class ChangelingDisguiseAbility extends ChangelingFeedAbility {
return;
}
RayTraceHelper.Trace trace = RayTraceHelper.doTrace(player, 10, 1, EntityPredicates.CAN_COLLIDE.and(e -> !(e instanceof LightningEntity)));
RayTraceHelper.Trace trace = RayTraceHelper.doTrace(player, 10, 1, EntityPredicates.EXCEPT_SPECTATOR.and(e -> !(e instanceof LightningEntity)));
Entity looked = trace.getEntity().filter(e -> !(e instanceof AbstractDecorationEntity)).map(e -> {
return e instanceof PlayerEntity ? Pony.of((PlayerEntity)e)

2
src/main/java/com/minelittlepony/unicopia/ability/UnicornProjectileAbility.java
View file

@ -94,7 +94,7 @@ public class UnicornProjectileAbility implements Ability<Hit> {
projectile.setHydrophobic();
if (spell instanceof HomingSpell) {
RayTraceHelper.doTrace(player.getMaster(), 600, 1, EntityPredicates.CAN_COLLIDE).getEntity().filter(((HomingSpell)spell)::setTarget).ifPresent(target -> {
RayTraceHelper.doTrace(player.getMaster(), 600, 1, EntityPredicates.EXCEPT_SPECTATOR).getEntity().filter(((HomingSpell)spell)::setTarget).ifPresent(target -> {
projectile.setHomingTarget(target);
});
}

2
src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java
View file

@ -67,7 +67,7 @@ public class UnicornTeleportAbility implements Ability<Pos> {
@Override
public Pos tryActivate(Pony player) {
int maxDistance = player.getMaster().isCreative() ? 1000 : 100;
HitResult ray = RayTraceHelper.doTrace(player.getMaster(), maxDistance, 1, EntityPredicates.CAN_COLLIDE).getResult();
HitResult ray = RayTraceHelper.doTrace(player.getMaster(), maxDistance, 1, EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR).getResult();
World w = player.getReferenceWorld();

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

@ -87,7 +87,7 @@ public class CatapultSpell extends AbstractSpell implements ProjectileSpell {
double maxDistance = 2 + (getTraits().get(Trait.FOCUS) - 50) * 8;
HitResult ray = RayTraceHelper.doTrace(caster.getEntity(), maxDistance, 1, EntityPredicates.CAN_COLLIDE).getResult();
HitResult ray = RayTraceHelper.doTrace(caster.getEntity(), maxDistance, 1, EntityPredicates.EXCEPT_SPECTATOR).getResult();
if (ray.getType() == HitResult.Type.ENTITY) {
EntityHitResult result = (EntityHitResult)ray;

2
src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java
View file

@ -55,7 +55,7 @@ public class ZapAppleItem extends Item implements ChameleonItem, ToxicHolder {
public TypedActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) {
ItemStack stack = player.getStackInHand(hand);
Optional<Entity> entity = RayTraceHelper.doTrace(player, 5, 1, EntityPredicates.CAN_COLLIDE.and(e -> canFeedTo(stack, e))).getEntity();
Optional<Entity> entity = RayTraceHelper.doTrace(player, 5, 1, EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR.and(e -> canFeedTo(stack, e))).getEntity();
if (entity.isPresent()) {
return onFedTo(stack, player, entity.get());

2
src/main/java/com/minelittlepony/unicopia/util/RayTraceHelper.java
View file

@ -33,7 +33,7 @@ public class RayTraceHelper {
* @return A Trace describing what was found.
*/
public static Trace doTrace(Entity e, double distance, float tickDelta) {
return doTrace(e, distance, tickDelta, EntityPredicates.CAN_COLLIDE);
return doTrace(e, distance, tickDelta, EntityPredicates.EXCEPT_SPECTATOR);
}
/**