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

Merge pull request #193 from jedk1/master

Browse source 
Fixed FlightAbility fly glitch.
This commit is contained in:
MistPhizzle 2015-08-04 12:56:00 -04:00
commit f2c9cb69c1
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -732,7 +732,7 @@ public class PKListener implements Listener {
Player targetplayer = (Player) e.getEntity();
if (GeneralMethods.canBendPassive(sourceplayer.getName(), Element.Chi)) {
if (GeneralMethods.isBender(sourceplayer.getName(), Element.Chi) && e.getCause() == DamageCause.ENTITY_ATTACK && e.getDamage() == 1) {
if (ChiMethods.isChiAbility(GeneralMethods.getBoundAbility(sourceplayer)) {
if (ChiMethods.isChiAbility(GeneralMethods.getBoundAbility(sourceplayer))) {
if (GeneralMethods.isWeapon(sourceplayer.getItemInHand().getType()) && !plugin.getConfig().getBoolean("Properties.Chi.CanBendWithWeapons")) {
return;
}

2
src/com/projectkorra/projectkorra/airbending/FlightAbility.java
View file

@ -19,6 +19,8 @@ public class FlightAbility extends CoreAbility {
public FlightAbility(Player player) {
if (!AirMethods.canFly(player, true, false))
return;
if (flight == null)
flight = new Flight(player);
player.setAllowFlight(true);
player.setVelocity(player.getEyeLocation().getDirection().normalize());
this.player = player;

2
src/com/projectkorra/projectkorra/configuration/ConfigManager.java
View file

@ -491,7 +491,7 @@ public class ConfigManager {
config.addDefault("Abilities.Earth.EarthBlast.Range", 20);
config.addDefault("Abilities.Earth.EarthBlast.Speed", 35);
config.addDefault("Abilities.Earth.EarthBlast.Revert", true);
config.addDefault("Abilities.Earth.Earthblast.Damage", 3);
config.addDefault("Abilities.Earth.EarthBlast.Damage", 3);
config.addDefault("Abilities.Earth.EarthBlast.Push", 0.3);
config.addDefault("Abilities.Earth.EarthGrab.Enabled", true);