mirror of
https://github.com/TotalFreedomMC/TF-ProjectKorra.git
synced 2025-01-10 08:57:13 +00:00
Bug fixes (#523)
* Fixes NPE with surge wave & bottles * Fixed bracket :S For some reason it PR'd my bracket and code separate? Weird. * Changed dayfactor placement so that it's correct with avatar state factor
This commit is contained in:
parent
533d713774
commit
cc39cc79f9
2 changed files with 6 additions and 4 deletions
src/com/projectkorra/projectkorra
|
@ -70,18 +70,18 @@ public class FireBlastCharged extends FireAbility {
|
|||
|
||||
if (isDay(player.getWorld())) {
|
||||
this.chargeTime = (long) (chargeTime / getDayFactor());
|
||||
this.maxDamage = getDayFactor(maxDamage);
|
||||
this.range = getDayFactor(range);
|
||||
}
|
||||
if (bPlayer.isAvatarState()) {
|
||||
this.chargeTime = 0;
|
||||
this.maxDamage = AvatarState.getValue(maxDamage);
|
||||
}
|
||||
|
||||
this.range = getDayFactor(range);
|
||||
|
||||
if (!player.getEyeLocation().getBlock().isLiquid()) {
|
||||
start();
|
||||
} if (isDay(player.getWorld())) {
|
||||
this.maxDamage = getDayFactor(maxDamage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean annihilateBlasts(Location location, double radius, Player source) {
|
||||
|
|
|
@ -356,8 +356,10 @@ public class SurgeWave extends WaterAbility {
|
|||
|
||||
public void returnWater() {
|
||||
if (location != null) {
|
||||
if (player.isOnline()) {
|
||||
new WaterReturn(player, location.getBlock());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void thaw() {
|
||||
|
|
Loading…
Reference in a new issue