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

Merge pull request #402 from OmniCypher-/master

Browse source 
Various fixes
This commit is contained in:
OmniCypher 2016-02-14 13:53:48 -08:00
parent 27a658affe 8527705ff3
commit 5cd8834085
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/com/projectkorra/projectkorra/airbending/AirBurst.java
View file

@ -1,5 +1,6 @@
package com.projectkorra.projectkorra.airbending; package com.projectkorra.projectkorra.airbending;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.ProjectKorra; import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.AirAbility; import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.avatar.AvatarState; import com.projectkorra.projectkorra.avatar.AvatarState;
@ -91,6 +92,10 @@ public class AirBurst extends AirAbility {
} }
private void fallBurst() { private void fallBurst() {
if (bPlayer.isOnCooldown("AirBurst")) {
return;
}
Location location = player.getLocation(); Location location = player.getLocation();
double x, y, z; double x, y, z;
double r = 1; double r = 1;

5
src/com/projectkorra/projectkorra/airbending/AirScooter.java
View file

@ -87,7 +87,7 @@ public class AirScooter extends AirAbility {
@Override @Override
public void progress() { public void progress() {
if (!bPlayer.canBendIgnoreCooldowns(this) || !player.isFlying()) { if (!bPlayer.canBendIgnoreCooldowns(this)) {
remove(); remove();
return; return;
} }
@ -138,9 +138,6 @@ public class AirScooter extends AirAbility {
@Override @Override
public void remove() { public void remove() {
super.remove(); super.remove();
player.setFlying(hadFly);
player.setAllowFlight(canFly);
player.setSprinting(false);
} }
private void spinScooter() { private void spinScooter() {

4
src/com/projectkorra/projectkorra/command/PresetCommand.java
View file

@ -119,7 +119,7 @@ public class PresetCommand extends PKCommand {
bPlayer2 = BendingPlayer.getBendingPlayer(player2); bPlayer2 = BendingPlayer.getBendingPlayer(player2);
} }
if (bPlayer2.isPermaRemoved()) { if (bPlayer2.isPermaRemoved()) {
player.sendMessage(ChatColor.RED + "Your bending was permanently removed."); player.sendMessage(ChatColor.RED + "That players bending was permanently removed.");
return; return;
} }
boolean boundAll = Preset.bindExternalPreset(player2, name); boolean boundAll = Preset.bindExternalPreset(player2, name);
@ -148,7 +148,7 @@ public class PresetCommand extends PKCommand {
bPlayer2 = BendingPlayer.getBendingPlayer(player2); bPlayer2 = BendingPlayer.getBendingPlayer(player2);
} }
if (bPlayer2.isPermaRemoved()) { if (bPlayer2.isPermaRemoved()) {
player.sendMessage(ChatColor.RED + "Your bending was permanently removed."); player.sendMessage(ChatColor.RED + "That players bending was permanently removed.");
return; return;
} }
Preset preset = Preset.getPreset(player, name); Preset preset = Preset.getPreset(player, name);

2
src/com/projectkorra/projectkorra/earthbending/Shockwave.java
View file

@ -44,6 +44,8 @@ public class Shockwave extends EarthAbility {
return; return;
} else if (player.getFallDistance() < threshold || !isEarthbendable(player.getLocation().add(0, -1, 0).getBlock())) { } else if (player.getFallDistance() < threshold || !isEarthbendable(player.getLocation().add(0, -1, 0).getBlock())) {
return; return;
} else if(bPlayer.isOnCooldown("Shockwave")) {
return;
} }
areaShockwave(); areaShockwave();