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

Various fixes (#540)

Browse source 
* Various fixes

-AirSwipe no longer goes through blocks
-WaterSpout dosen't disappear when at max height

* Revert "Various fixes"

This reverts commit 4633e8381a230129a4ce3e72d309d1656f43ef30.

* Revert "Revert "Various fixes""

This reverts commit 8f85f877378f71e2977ab28cd19dc955d9853dd4.
This commit is contained in:
Matt 2016-08-13 16:19:31 -04:00 committed by OmniCypher
parent 2ef30d15d7
commit cb219ca067
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/com/projectkorra/projectkorra/airbending/AirSwipe.java
View file

@ -141,6 +141,11 @@ public class AirSwipe extends AirAbility {
} }
Block block = location.getBlock(); Block block = location.getBlock();
if (!EarthAbility.isTransparent(player, block)) {
remove();
return;
}
for (Block testblock : GeneralMethods.getBlocksAroundPoint(location, radius)) { for (Block testblock : GeneralMethods.getBlocksAroundPoint(location, radius)) {
if (testblock.getType() == Material.FIRE) { if (testblock.getType() == Material.FIRE) {
testblock.setType(Material.AIR); testblock.setType(Material.AIR);

26
src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
View file

@ -1,11 +1,10 @@
package com.projectkorra.projectkorra.waterbending; package com.projectkorra.projectkorra.waterbending;
import com.projectkorra.projectkorra.GeneralMethods; import java.util.ArrayList;
import com.projectkorra.projectkorra.ProjectKorra; import java.util.List;
import com.projectkorra.projectkorra.ability.WaterAbility; import java.util.Map;
import com.projectkorra.projectkorra.util.Flight; import java.util.Random;
import com.projectkorra.projectkorra.util.ParticleEffect; import java.util.concurrent.ConcurrentHashMap;
import com.projectkorra.projectkorra.util.TempBlock;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -13,11 +12,11 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import java.util.ArrayList; import com.projectkorra.projectkorra.GeneralMethods;
import java.util.List; import com.projectkorra.projectkorra.ability.WaterAbility;
import java.util.Map; import com.projectkorra.projectkorra.util.Flight;
import java.util.Random; import com.projectkorra.projectkorra.util.ParticleEffect;
import java.util.concurrent.ConcurrentHashMap; import com.projectkorra.projectkorra.util.TempBlock;
public class WaterSpout extends WaterAbility { public class WaterSpout extends WaterAbility {
@ -32,6 +31,7 @@ public class WaterSpout extends WaterAbility {
private long interval; private long interval;
private double rotation; private double rotation;
private double height; private double height;
private double maxHeight;
private Block base; private Block base;
private TempBlock baseBlock; private TempBlock baseBlock;
private boolean canFly; private boolean canFly;
@ -185,7 +185,6 @@ public class WaterSpout extends WaterAbility {
return false; return false;
} }
double playerHeight = player.getLocation().getY(); double playerHeight = player.getLocation().getY();
double maxHeight = isNight(player.getWorld()) ? getNightFactor(height) : height;
if (playerHeight > baseBlockLocation.getY() + maxHeight + threshold) { if (playerHeight > baseBlockLocation.getY() + maxHeight + threshold) {
return false; return false;
} }
@ -233,7 +232,7 @@ public class WaterSpout extends WaterAbility {
newHeight = getNightFactor(newHeight); newHeight = getNightFactor(newHeight);
} }
double maxHeight = (height * ProjectKorra.plugin.getConfig().getDouble("Properties.Water.NightFactor")) + 5; this.maxHeight = newHeight + 5;
Block blocki; Block blocki;
for (int i = 0; i < maxHeight; i++) { for (int i = 0; i < maxHeight; i++) {
@ -273,7 +272,6 @@ public class WaterSpout extends WaterAbility {
} }
} }
} }
revertBaseBlock();
return -1; return -1;
} }