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

Added WaterArms falling block check to entitychangeblockevent.

Browse source
This commit is contained in:
jedk1 2015-05-31 15:18:58 +01:00
parent 9bbd231eef
commit 6aa5947481
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

@ -131,6 +131,7 @@ import com.projectkorra.ProjectKorra.waterbending.IceSpike2;
import com.projectkorra.ProjectKorra.waterbending.Melt; import com.projectkorra.ProjectKorra.waterbending.Melt;
import com.projectkorra.ProjectKorra.waterbending.OctopusForm; import com.projectkorra.ProjectKorra.waterbending.OctopusForm;
import com.projectkorra.ProjectKorra.waterbending.Torrent; import com.projectkorra.ProjectKorra.waterbending.Torrent;
import com.projectkorra.ProjectKorra.waterbending.WaterArms;
import com.projectkorra.ProjectKorra.waterbending.WaterManipulation; import com.projectkorra.ProjectKorra.waterbending.WaterManipulation;
import com.projectkorra.ProjectKorra.waterbending.WaterMethods; import com.projectkorra.ProjectKorra.waterbending.WaterMethods;
import com.projectkorra.ProjectKorra.waterbending.WaterPassive; import com.projectkorra.ProjectKorra.waterbending.WaterPassive;
@ -518,6 +519,9 @@ public class PKListener implements Listener {
if (abil.equalsIgnoreCase("Torrent")) { if (abil.equalsIgnoreCase("Torrent")) {
Torrent.create(player); Torrent.create(player);
} }
if (abil.equalsIgnoreCase("WaterArms")) {
new WaterArms(player);
}
} }
if (EarthMethods.isEarthAbility(abil)) { if (EarthMethods.isEarthAbility(abil)) {
@ -712,6 +716,10 @@ public class PKListener implements Listener {
LavaSurge.falling.remove(entity); LavaSurge.falling.remove(entity);
event.setCancelled(true); event.setCancelled(true);
} }
if (WaterArms.falling.containsKey(entity)) {
WaterArms.falling.remove(entity);
event.setCancelled(true);
}
} }
} }
@ -827,7 +835,7 @@ public class PKListener implements Listener {
AirScooter.check(player); AirScooter.check(player);
String abil = GeneralMethods.getBoundAbility(player); String abil = GeneralMethods.getBoundAbility(player);
if (abil == null) return; if (abil == null && !MultiAbilityManager.hasMultiAbilityBound(player)) return;
if (GeneralMethods.canBend(player.getName(), abil)) { if (GeneralMethods.canBend(player.getName(), abil)) {
if (GeneralMethods.isDisabledStockAbility(abil)) if (GeneralMethods.isDisabledStockAbility(abil))
return; return;
@ -1030,6 +1038,13 @@ public class PKListener implements Listener {
if (abil.equalsIgnoreCase("AvatarState")) { if (abil.equalsIgnoreCase("AvatarState")) {
new AvatarState(player); new AvatarState(player);
} }
if(MultiAbilityManager.hasMultiAbilityBound(player)){
abil = MultiAbilityManager.getBoundMultiAbility(player);
if (abil.equalsIgnoreCase("WaterArms")) {
new WaterArms(player);
}
}
} }
} }