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

Prevent flying sounds from playing whilst disguised

Browse source
This commit is contained in:
Sollace 2021-08-23 23:08:03 +02:00
parent 0d06f13ee5
commit 6fbcce7c22
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/minelittlepony/unicopia/ability/magic/SpellContainer.java
View file

@ -14,8 +14,7 @@ public interface SpellContainer {
} }
@Override @Override
public void put(Spell effect) { public void put(Spell effect) { }
}
}; };
/** /**

7
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/SpellPredicate.java
View file

@ -3,12 +3,17 @@ package com.minelittlepony.unicopia.ability.magic.spell;
import java.util.function.Predicate; import java.util.function.Predicate;
import com.minelittlepony.unicopia.ability.magic.Attached; import com.minelittlepony.unicopia.ability.magic.Attached;
import com.minelittlepony.unicopia.ability.magic.Caster;
import com.minelittlepony.unicopia.ability.magic.Spell; import com.minelittlepony.unicopia.ability.magic.Spell;
import com.minelittlepony.unicopia.ability.magic.Suppressable; import com.minelittlepony.unicopia.ability.magic.Suppressable;
import com.minelittlepony.unicopia.ability.magic.Thrown; import com.minelittlepony.unicopia.ability.magic.Thrown;
public interface SpellPredicate<T> extends Predicate<Spell> { public interface SpellPredicate<T extends Spell> extends Predicate<Spell> {
SpellPredicate<Thrown> IS_THROWN = s -> s instanceof Thrown; SpellPredicate<Thrown> IS_THROWN = s -> s instanceof Thrown;
SpellPredicate<Attached> IS_ATTACHED = s -> s instanceof Attached; SpellPredicate<Attached> IS_ATTACHED = s -> s instanceof Attached;
SpellPredicate<Suppressable> IS_SUPPRESSABLE = s -> s instanceof Suppressable; SpellPredicate<Suppressable> IS_SUPPRESSABLE = s -> s instanceof Suppressable;
default boolean isOn(Caster<?> caster) {
return caster.getSpellSlot().get(this, false).isPresent();
}
} }

6
src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java
View file

@ -315,14 +315,16 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
ticksToGlide = 20; ticksToGlide = 20;
} }
if (!SpellType.DISGUISE.isOn(pony)) {
if (ticksInAir % 200 == 1 && pony.isClient()) { if (ticksInAir % 200 == 1 && pony.isClient()) {
InteractionManager.instance().playLoopingSound(entity, InteractionManager.SOUND_GLIDING); InteractionManager.instance().playLoopingSound(entity, InteractionManager.SOUND_GLIDING);
} }
}
velocity.y -= 0.02 * getGravitySignum(); velocity.y -= 0.02 * getGravitySignum();
velocity.x *= 0.9896; velocity.x *= 0.9896;
velocity.z *= 0.9896; velocity.z *= 0.9896;
} else if (type == FlightType.INSECTOID) { } else if (type == FlightType.INSECTOID && !SpellType.DISGUISE.isOn(pony)) {
if (entity.world.isClient && !soundPlaying) { if (entity.world.isClient && !soundPlaying) {
soundPlaying = true; soundPlaying = true;
InteractionManager.instance().playLoopingSound(entity, InteractionManager.SOUND_CHANGELING_BUZZ); InteractionManager.instance().playLoopingSound(entity, InteractionManager.SOUND_CHANGELING_BUZZ);
@ -474,7 +476,9 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
if (thrustScale <= 0.000001F & flapping) { if (thrustScale <= 0.000001F & flapping) {
flapping = false; flapping = false;
if (!SpellType.DISGUISE.isOn(pony)) {
entity.playSound(getFlightType().getWingFlapSound(), 0.5F, 1); entity.playSound(getFlightType().getWingFlapSound(), 0.5F, 1);
}
thrustScale = 1; thrustScale = 1;
} }