mirror of
https://github.com/TotalFreedomMC/TF-ProjectKorra.git
synced 2024-09-11 12:49:32 +00:00
commit
1193d2cb3c
|
@ -1244,6 +1244,7 @@ public class GeneralMethods {
|
|||
stopPlugin();
|
||||
}
|
||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||
Preset.unloadPreset(player);
|
||||
GeneralMethods.createBendingPlayer(player.getUniqueId(), player.getName());
|
||||
}
|
||||
plugin.updater.checkUpdate();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue