From 801cd6e50fa2682a535b273ec068a93efd89bd58 Mon Sep 17 00:00:00 2001 From: Simplicitee Date: Sun, 28 Oct 2018 13:16:03 -0400 Subject: [PATCH] Tweaking --- src/com/projectkorra/projectkorra/GeneralMethods.java | 2 +- src/com/projectkorra/projectkorra/ability/WaterAbility.java | 3 +-- .../projectkorra/configuration/ConfigManager.java | 4 ++-- .../projectkorra/projectkorra/waterbending/OctopusForm.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/com/projectkorra/projectkorra/GeneralMethods.java b/src/com/projectkorra/projectkorra/GeneralMethods.java index e6511766..fef519ca 100644 --- a/src/com/projectkorra/projectkorra/GeneralMethods.java +++ b/src/com/projectkorra/projectkorra/GeneralMethods.java @@ -1182,7 +1182,7 @@ public class GeneralMethods { } public static Location getTargetedLocation(final Player player, final int range) { - return getTargetedLocation(player, range); + return getTargetedLocation(player, range, Material.AIR); } public static Block getTopBlock(final Location loc, final int range) { diff --git a/src/com/projectkorra/projectkorra/ability/WaterAbility.java b/src/com/projectkorra/projectkorra/ability/WaterAbility.java index d2b1a988..b133e0a2 100644 --- a/src/com/projectkorra/projectkorra/ability/WaterAbility.java +++ b/src/com/projectkorra/projectkorra/ability/WaterAbility.java @@ -3,7 +3,6 @@ package com.projectkorra.projectkorra.ability; import java.util.HashSet; import java.util.Set; -import org.bukkit.Effect; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; @@ -291,7 +290,7 @@ public abstract class WaterAbility extends ElementalAbility { } public static void playFocusWaterEffect(final Block block) { - block.getWorld().playEffect(block.getLocation(), Effect.SMOKE, 4, 20); + ParticleEffect.SMOKE_NORMAL.display(block.getLocation().add(0.5, 0.5, 0.5), 4); } public static void playIcebendingSound(final Location loc) { diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java index 49da8bbf..dcfa924e 100644 --- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java +++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java @@ -557,7 +557,7 @@ public class ConfigManager { config.addDefault("Properties.Earth.EarthSound.Sound", "ENTITY_GHAST_SHOOT"); config.addDefault("Properties.Earth.EarthSound.Volume", 1); config.addDefault("Properties.Earth.EarthSound.Pitch", 1); - config.addDefault("Properties.Earth.MetalSound.Sound", "ENTITY_IRONGOLEM_HURT"); + config.addDefault("Properties.Earth.MetalSound.Sound", "ENTITY_IRON_GOLEM_HURT"); config.addDefault("Properties.Earth.MetalSound.Volume", 1); config.addDefault("Properties.Earth.MetalSound.Pitch", 1.25); config.addDefault("Properties.Earth.SandSound.Sound", "BLOCK_SAND_BREAK"); @@ -575,7 +575,7 @@ public class ConfigManager { config.addDefault("Properties.Fire.FireSound.Sound", "BLOCK_FIRE_AMBIENT"); config.addDefault("Properties.Fire.FireSound.Volume", 1); config.addDefault("Properties.Fire.FireSound.Pitch", 1); - config.addDefault("Properties.Fire.CombustionSound.Sound", "ENTITY_FIREWORK_BLAST"); + config.addDefault("Properties.Fire.CombustionSound.Sound", "ENTITY_FIREWORK_ROCKET_BLAST"); config.addDefault("Properties.Fire.CombustionSound.Volume", 1); config.addDefault("Properties.Fire.CombustionSound.Pitch", 0); config.addDefault("Properties.Fire.LightningSound.Sound", "ENTITY_CREEPER_HURT"); diff --git a/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java b/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java index b4002929..99f0ff26 100644 --- a/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java +++ b/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java @@ -431,7 +431,7 @@ public class OctopusForm extends WaterAbility { } else if (this.blocks.contains(tblock)) { this.newBlocks.add(tblock); } - } else if (this.isWaterbendable(this.player, block) || block.getType() == Material.FIRE || block.getType() == Material.AIR) { + } else if (this.isWaterbendable(this.player, block) || block.getType() == Material.FIRE || isAir(block.getType())) { if (isWater(block) && !TempBlock.isTempBlock(block)) { ParticleEffect.WATER_BUBBLE.display(block.getLocation().clone().add(0.5, 0.5, 0.5), 5, Math.random(), Math.random(), Math.random(), 0); }