mirror of
https://github.com/TotalFreedomMC/TF-ProjectKorra.git
synced 2025-02-11 11:40:40 +00:00
Merge branch 'wip-1.13' of https://github.com/Simplicitee/ProjectKorra into wip-1.13
merge up
This commit is contained in:
commit
4a79d90327
2 changed files with 2 additions and 1 deletions
|
@ -27,6 +27,7 @@ public class FerroControl extends MetalAbility implements PassiveAbility {
|
|||
@Override
|
||||
public void progress() {
|
||||
if (!this.player.isSneaking() || !this.bPlayer.canUsePassive(this) || !this.bPlayer.canBendPassive(this)) {
|
||||
remove();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ public class FastSwim extends WaterAbility implements PassiveAbility {
|
|||
}
|
||||
|
||||
if (this.bPlayer.getBoundAbility() == null || (this.bPlayer.getBoundAbility() != null && !this.bPlayer.getBoundAbility().isSneakAbility())) {
|
||||
if (!this.player.isSneaking()) {
|
||||
if (this.player.isSneaking()) {
|
||||
if (isWater(this.player.getLocation().getBlock()) && !this.bPlayer.isOnCooldown(this)) {
|
||||
player.setVelocity(this.player.getEyeLocation().getDirection().clone().normalize().multiply(this.swimSpeed));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue