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

Fixed Paralysis from ChiCombos not working on players

Browse source 
Players would go berserk once paralyzed. This bug is fixed.
This commit is contained in:
Brendan Wilson 2015-01-15 18:17:22 -05:00
parent a551ea1091
commit 784e84e8aa
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -566,10 +566,16 @@ public class PKListener implements Listener {
if (event.isCancelled()) return;
Player player = event.getPlayer();
if (Paralyze.isParalyzed(player) || ChiComboManager.isParalyzed(player)) {
if (Paralyze.isParalyzed(player)) {
event.setCancelled(true);
return;
}
if(ChiComboManager.isParalyzed(player))
{
event.setTo(event.getFrom());
return;
}
if (Suffocate.isBreathbent(player)) {
Location loc = event.getFrom();

7
src/com/projectkorra/ProjectKorra/chiblocking/ChiComboManager.java
View file

@ -9,6 +9,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra;
@ -144,7 +145,11 @@ public class ChiComboManager
{
for(Entity e : paralyzed)
{
e.setVelocity(Methods.getDirection(e.getLocation(), paralyzedLocations.get(e)));
if(!(e instanceof Player))
{
e.setVelocity(Methods.getDirection(e.getLocation(), paralyzedLocations.get(e)));
}
//e.teleport(paralyzedLocations.get(e));
}
}
}