TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-12 03:59:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #306 from jedk1/master

Browse source 
Add bubbles to Torrent & WaterManip
This commit is contained in:
OmniCypher 2015-11-20 16:34:52 -08:00
commit 43d706fbcf
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/command/BendingTabComplete.java
View file

@ -38,7 +38,7 @@ public class BendingTabComplete implements TabCompleter
if (args.length == 2) if (args.length == 2)
{ {
for (String abil : AbilityModuleManager.abilities) { for (String abil : AbilityModuleManager.abilities) {
if (GeneralMethods.canBend(sender.getName(), abil)) { if (GeneralMethods.canBind(sender.getName(), abil)) {
abilities.add(abil); abilities.add(abil);
} }
} }

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

@ -7,6 +7,7 @@ import com.projectkorra.projectkorra.airbending.AirMethods;
import com.projectkorra.projectkorra.earthbending.EarthMethods; import com.projectkorra.projectkorra.earthbending.EarthMethods;
import com.projectkorra.projectkorra.util.BlockSource; import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType; import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock; import com.projectkorra.projectkorra.util.TempBlock;
import org.bukkit.Location; import org.bukkit.Location;
@ -356,6 +357,9 @@ public class Torrent {
return true; return true;
} }
if (b.getLocation().distance(targetloc) > 1) { if (b.getLocation().distance(targetloc) > 1) {
if (WaterMethods.isWater(b)) {
ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, b.getLocation().clone().add(.5,.5,.5), 257D);
}
newblocks.add(new TempBlock(b, Material.STATIONARY_WATER, (byte) 8)); newblocks.add(new TempBlock(b, Material.STATIONARY_WATER, (byte) 8));
} else { } else {
if (layer < maxlayer) { if (layer < maxlayer) {

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

@ -11,6 +11,7 @@ import com.projectkorra.projectkorra.firebending.Combustion;
import com.projectkorra.projectkorra.firebending.FireBlast; import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.util.BlockSource; import com.projectkorra.projectkorra.util.BlockSource;
import com.projectkorra.projectkorra.util.ClickType; import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock; import com.projectkorra.projectkorra.util.TempBlock;
import org.bukkit.Effect; import org.bukkit.Effect;
@ -500,6 +501,9 @@ public class WaterManipulation {
} }
if (FreezeMelt.frozenblocks.containsKey(block)) if (FreezeMelt.frozenblocks.containsKey(block))
FreezeMelt.frozenblocks.remove(block); FreezeMelt.frozenblocks.remove(block);
if (WaterMethods.isWater(block)) {
ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, block.getLocation().clone().add(.5,.5,.5), 257D);
}
block.setType(Material.STATIONARY_WATER); block.setType(Material.STATIONARY_WATER);
block.setData(full); block.setData(full);
} }