Clean up Waterbending Sounds

This commit is contained in:
MistPhizzle 2014-09-28 10:38:52 -04:00
parent 7bfe129ceb
commit c30df35a87
7 changed files with 39 additions and 40 deletions

View file

@ -7,7 +7,6 @@ import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.configuration.MemorySection;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;

View file

@ -174,10 +174,6 @@ public class OctopusForm {
return;
}
if (Methods.rand.nextInt(4) == 0) {
Methods.playWaterbendingSound(player.getLocation());
}
if (System.currentTimeMillis() > time + interval) {
time = System.currentTimeMillis();
@ -237,11 +233,17 @@ public class OctopusForm {
} else {
angle += 20;
}
if (Methods.rand.nextInt(4) == 0) {
Methods.playWaterbendingSound(player.getLocation());
}
formOctopus();
if (y == 2) {
incrementStep();
}
} else if (formed) {
if (Methods.rand.nextInt(7) == 0) {
Methods.playWaterbendingSound(player.getLocation());
}
step += 1;
if (step % inc == 0)
animstep += 1;

View file

@ -115,10 +115,6 @@ public class Torrent {
return;
}
if (Methods.rand.nextInt(4) == 0) {
Methods.playWaterbendingSound(location);
}
if (System.currentTimeMillis() > time + interval) {
time = System.currentTimeMillis();
@ -210,6 +206,9 @@ public class Torrent {
}
if (forming || formed) {
if (Methods.rand.nextInt(4) == 0) {
Methods.playWaterbendingSound(location);
}
if (angle < 220) {
angle += 20;
} else {

View file

@ -153,7 +153,7 @@ public class TorrentBurst {
}
for(Block sound : torrentblocks) {
if (Methods.rand.nextInt(4) == 0) {
if (Methods.rand.nextInt(50) == 0) {
Methods.playWaterbendingSound(sound.getLocation());
}
}

View file

@ -240,10 +240,6 @@ public class WaterWall {
return false;
}
if (Methods.rand.nextInt(4) == 0) {
Methods.playWaterbendingSound(location);
}
if (System.currentTimeMillis() - time >= interval) {
time = System.currentTimeMillis();
@ -274,6 +270,9 @@ public class WaterWall {
}
if (forming) {
if (Methods.rand.nextInt(7) == 0) {
Methods.playWaterbendingSound(location);
}
ArrayList<Block> blocks = new ArrayList<Block>();
Location loc = Methods.getTargetedLocation(player, (int) range, 8, 9, 79);
location = loc.clone();

View file

@ -249,7 +249,7 @@ public class Wave {
FireBlast.removeFireBlastsAroundPoint(block.getLocation(), 2);
}
if (Methods.rand.nextInt(4) == 0) {
if (Methods.rand.nextInt(15) == 0) {
Methods.playWaterbendingSound(location);
}
// if (!blocks.contains(block)