TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-1.13' of https://github.com/Simplicitee/ProjectKorra into wip-1.13

Browse source 
merge up
This commit is contained in:
PhanaticD 2018-12-28 22:29:05 -05:00
commit 4a79d90327
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/com/projectkorra/projectkorra/earthbending/passive/FerroControl.java
View file

@ -27,6 +27,7 @@ public class FerroControl extends MetalAbility implements PassiveAbility {
@Override @Override
public void progress() { public void progress() {
if (!this.player.isSneaking() || !this.bPlayer.canUsePassive(this) || !this.bPlayer.canBendPassive(this)) { if (!this.player.isSneaking() || !this.bPlayer.canUsePassive(this) || !this.bPlayer.canBendPassive(this)) {
remove();
return; return;
} }

2
src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java
View file

@ -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.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)) { if (isWater(this.player.getLocation().getBlock()) && !this.bPlayer.isOnCooldown(this)) {
player.setVelocity(this.player.getEyeLocation().getDirection().clone().normalize().multiply(this.swimSpeed)); player.setVelocity(this.player.getEyeLocation().getDirection().clone().normalize().multiply(this.swimSpeed));
} }