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

Changes: Tornado, Illumination, SurgeWave (#567)

Browse source
This commit is contained in:
Sobki 2016-09-03 02:46:19 +10:00 committed by OmniCypher
parent 384b5662b8
commit e4df21b696
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ public class Tornado extends AirAbility {
double timefactor = currentHeight / maxHeight;
currentRadius = timefactor * radius;
if (origin.getBlock().getType() != Material.AIR) {
if (origin.getBlock().getType() != Material.AIR && origin.getBlock().getType() != Material.BARRIER) {
origin.setY(origin.getY() - 1. / 10. * currentHeight);
for (Entity entity : GeneralMethods.getEntitiesAroundPoint(origin, currentHeight)) {

3
src/com/projectkorra/projectkorra/firebending/FirePassive.java
View file

@ -22,7 +22,8 @@ public class FirePassive {
player.setFireTicks(80);
}
if (CoreAbility.getAbility(player, Illumination.class) == null) {
if (bPlayer != null && !CoreAbility.hasAbility(player, Illumination.class)
&& bPlayer.canBendIgnoreBinds(CoreAbility.getAbility("Illumination"))) {
new Illumination(player);
}
}

4
src/com/projectkorra/projectkorra/waterbending/SurgeWave.java
View file

@ -353,11 +353,9 @@ public class SurgeWave extends WaterAbility {
}
public void returnWater() {
if (location != null) {
if (player.isOnline()) {
if (location != null && player.isOnline()) {
new WaterReturn(player, location.getBlock());
}
}
}
private void thaw() {

2
src/com/projectkorra/projectkorra/waterbending/WaterReturn.java
View file

@ -129,7 +129,7 @@ public class WaterReturn extends WaterAbility {
if (hasAbility(player, WaterManipulation.class)
|| hasAbility(player, WaterManipulation.class)
|| hasAbility(player, OctopusForm.class)
|| hasAbility(player, SurgeWave.class)
// || hasAbility(player, SurgeWave.class) NOTE: ONLY DISABLED TO PREVENT BOTTLEBENDING FROM BEING DISABLED FOREVER. ONCE BOTTLEBENDING HAS BEEN RECODED IN 1.9, THIS NEEDS TO BE READDED TO THE NEW SYSTEM.
|| hasAbility(player, SurgeWall.class)
|| hasAbility(player, IceSpikeBlast.class)) {
return true;