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

Flight, Chi Stance & Chris' life (#628)

Browse source 
* Fixed sprint with Flight. Fixed Acrobat & Warrior stance issues.

* Fixed Chris' Derp
This commit is contained in:
Sobki 2016-10-20 17:27:04 +10:00 committed by Christopher Martin
parent 2fdc59c0a5
commit 5f0dace64e
4 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1081,7 +1081,7 @@ public class PKListener implements Listener {
else if (AirFlight.isFlying(event.getPlayer())) { else if (AirFlight.isFlying(event.getPlayer())) {
if (AirFlight.isHovering(event.getPlayer())) { if (AirFlight.isHovering(event.getPlayer())) {
Location loc = event.getFrom(); Location loc = event.getFrom();
Location toLoc = player.getLocation(); Location toLoc = event.getTo();
if (loc.getX() != toLoc.getX() || loc.getY() != toLoc.getY() || loc.getZ() != toLoc.getZ()) { if (loc.getX() != toLoc.getX() || loc.getY() != toLoc.getY() || loc.getZ() != toLoc.getZ()) {
event.setCancelled(true); event.setCancelled(true);

23
src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
View file

@ -1,15 +1,15 @@
package com.projectkorra.projectkorra.chiblocking; package com.projectkorra.projectkorra.chiblocking;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.ChiAbility;
public class AcrobatStance extends ChiAbility { public class AcrobatStance extends ChiAbility {
private int speed; private int speed;
@ -30,11 +30,8 @@ public class AcrobatStance extends ChiAbility {
ChiAbility stance = bPlayer.getStance(); ChiAbility stance = bPlayer.getStance();
if (stance != null) { if (stance != null) {
stance.remove();
if (stance instanceof AcrobatStance) { if (stance instanceof AcrobatStance) {
bPlayer.setStance(null); remove();
GeneralMethods.displayMovePreview(player, this);
player.playSound(player.getLocation(), Sound.ENTITY_ENDERDRAGON_SHOOT, 0.5F, 2F);
return; return;
} }
} }
@ -59,6 +56,16 @@ public class AcrobatStance extends ChiAbility {
} }
} }
@Override
public void remove() {
super.remove();
bPlayer.setStance(null);
GeneralMethods.displayMovePreview(player, this);
player.playSound(player.getLocation(), Sound.ENTITY_ENDERDRAGON_SHOOT, 0.5F, 2F);
player.removePotionEffect(PotionEffectType.SPEED);
player.removePotionEffect(PotionEffectType.JUMP);
}
@Override @Override
public String getName() { public String getName() {
return "AcrobatStance"; return "AcrobatStance";

15
src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
View file

@ -25,11 +25,8 @@ public class WarriorStance extends ChiAbility {
ChiAbility stance = bPlayer.getStance(); ChiAbility stance = bPlayer.getStance();
if (stance != null) { if (stance != null) {
stance.remove();
if (stance instanceof WarriorStance) { if (stance instanceof WarriorStance) {
bPlayer.setStance(null); remove();
GeneralMethods.displayMovePreview(player, this);
player.playSound(player.getLocation(), Sound.ENTITY_ENDERDRAGON_SHOOT, 0.5F, 2F);
return; return;
} }
} }
@ -54,6 +51,16 @@ public class WarriorStance extends ChiAbility {
} }
} }
@Override
public void remove() {
super.remove();
bPlayer.setStance(null);
GeneralMethods.displayMovePreview(player, this);
player.playSound(player.getLocation(), Sound.ENTITY_ENDERDRAGON_SHOOT, 0.5F, 2F);
player.removePotionEffect(PotionEffectType.DAMAGE_RESISTANCE);
player.removePotionEffect(PotionEffectType.INCREASE_DAMAGE);
}
@Override @Override
public String getName() { public String getName() {
return "WarriorStance"; return "WarriorStance";

2
src/com/projectkorra/projectkorra/util/logging/LogFilter.java
View file

@ -59,7 +59,7 @@ public class LogFilter implements Filter {
return false; return false;
} }
if(Bukkit.getServer().getPluginManager().isPluginEnabled(ProjectKorra.plugin.getName())) { if (!Bukkit.getServer().getPluginManager().isPluginEnabled(ProjectKorra.plugin.getName())) {
return false; return false;
} }