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

Fix Paralyze

Browse source
This commit is contained in:
MistPhizzle 2014-06-29 20:36:32 -04:00
parent c6e45753e1
commit 32c0646524
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/com/projectkorra/ProjectKorra/PKListener.java
View file

@ -203,6 +203,7 @@ public class PKListener implements Listener {
if (Paralyze.isParalyzed(player) || Bloodbending.isBloodbended(player)) { if (Paralyze.isParalyzed(player) || Bloodbending.isBloodbended(player)) {
event.setCancelled(true); event.setCancelled(true);
return;
} }
AirScooter.check(player); AirScooter.check(player);
@ -487,6 +488,7 @@ public class PKListener implements Listener {
if (Bloodbending.isBloodbended(player) || Paralyze.isParalyzed(player)) { if (Bloodbending.isBloodbended(player) || Paralyze.isParalyzed(player)) {
event.setCancelled(true); event.setCancelled(true);
return;
} }
if (Methods.isChiBlocked(player.getName())) { if (Methods.isChiBlocked(player.getName())) {
@ -834,7 +836,7 @@ public class PKListener implements Listener {
Player targetplayer = (Player) e.getEntity(); Player targetplayer = (Player) e.getEntity();
if (Methods.canBendPassive(sourceplayer.getName(), Element.Chi)) { if (Methods.canBendPassive(sourceplayer.getName(), Element.Chi)) {
if (Methods.isBender(sourceplayer.getName(), Element.Chi) && e.getCause() == DamageCause.ENTITY_ATTACK && e.getDamage() == 1) { if (Methods.isBender(sourceplayer.getName(), Element.Chi) && e.getCause() == DamageCause.ENTITY_ATTACK && e.getDamage() == 1) {
if (sourceplayer.getLocation().distance(targetplayer.getLocation()) <= plugin.getConfig().getDouble("Abilities.Chi.RapidPunch.Distance")) { if (sourceplayer.getLocation().distance(targetplayer.getLocation()) <= plugin.getConfig().getDouble("Abilities.Chi.RapidPunch.Distance") && Methods.getBoundAbility(sourceplayer) == null) {
if (Methods.isWeapon(sourceplayer.getItemInHand().getType()) && !plugin.getConfig().getBoolean("Properties.Chi.CanBendWithWeapons")) { if (Methods.isWeapon(sourceplayer.getItemInHand().getType()) && !plugin.getConfig().getBoolean("Properties.Chi.CanBendWithWeapons")) {
return; return;
} else { } else {
@ -846,6 +848,19 @@ public class PKListener implements Listener {
} }
} }
} }
if (Methods.canBendPassive(sourceplayer.getName(), Element.Chi)) {
if (Methods.isWeapon(sourceplayer.getItemInHand().getType()) && !ProjectKorra.plugin.getConfig().getBoolean("Properties.Chi.CanBendWithWeapons")) {
return;
}
if (e.getCause() == DamageCause.ENTITY_ATTACK) {
if (Methods.getBoundAbility(sourceplayer) != null && Methods.getBoundAbility(sourceplayer).equalsIgnoreCase("Paralyze")) {
if (ChiPassive.willChiBlock(targetplayer)) {
new Paralyze(sourceplayer, targetplayer);
}
}
}
}
// Player damager = (Player) e.getDamager(); // Player damager = (Player) e.getDamager();
// if (Methods.canBendPassive(damager.getName(), Element.Chi)) { // if (Methods.canBendPassive(damager.getName(), Element.Chi)) {
// if (e.getCause() == DamageCause.ENTITY_ATTACK) { // if (e.getCause() == DamageCause.ENTITY_ATTACK) {