TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-11-04 11:15:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix Water Bugs

Browse source
This commit is contained in:
jedk1 2016-02-09 14:23:04 +00:00
parent 5ea8cd39e0
commit db6d7a9e8b
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
View file

@ -66,7 +66,7 @@ public class SurgeWall extends WaterAbility {
SurgeWall wall = getAbility(player, SurgeWall.class);
if (wall != null) {
if (wall.progressing) {
freezeThaw();
wall.freezeThaw();
} else if (prepare()) {
wall.remove();
start();

3
src/com/projectkorra/projectkorra/waterbending/WaterArmsSpear.java
View file

@ -1,6 +1,5 @@
package com.projectkorra.projectkorra.waterbending;
import com.projectkorra.projectkorra.BendingManager;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.util.TempBlock;
@ -77,7 +76,7 @@ public class WaterArmsSpear extends WaterAbility {
spearRange = spearRangeFullMoon;
spearSphere = spearSphereFullMoon;
spearDuration = spearDurationFullMoon;
} else if (BendingManager.events.get(world).equalsIgnoreCase("FullMoon")) {
} else if (isFullMoon(world)) {
spearRange = spearRangeFullMoon;
spearSphere = spearSphereFullMoon;
spearDuration = spearDurationFullMoon;

3
src/com/projectkorra/projectkorra/waterbending/WaterArmsWhip.java
View file

@ -1,6 +1,5 @@
package com.projectkorra.projectkorra.waterbending;
import com.projectkorra.projectkorra.BendingManager;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
@ -116,7 +115,7 @@ public class WaterArmsWhip extends WaterAbility {
} else {
whipLength = whipLengthFullMoon;
}
} else if (BendingManager.events.get(world).equalsIgnoreCase("FullMoon")) {
} else if (isFullMoon(world)) {
if (ability.equals(Whip.PUNCH)) {
whipLength = punchLengthFullMoon;
} else {

4
src/com/projectkorra/projectkorra/waterbending/WaterReturn.java
View file

@ -34,8 +34,8 @@ public class WaterReturn extends WaterAbility {
this.range = getNightFactor(range);
if (bPlayer.canBend(this)) {
if (isTransparent(player, block) && !block.isLiquid() && hasEmptyWaterBottle()) {
if (bPlayer.canBendIgnoreBindsCooldowns(this)) {
if (isTransparent(player, block) && ((TempBlock.isTempBlock(block) && block.isLiquid()) || !block.isLiquid()) && hasEmptyWaterBottle()) {
this.block = new TempBlock(block, Material.WATER, (byte) 0);
}
}