diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index a3e9a9f8..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -ProjectKorra \ No newline at end of file diff --git a/.idea/artifacts/Korra_jar.xml b/.idea/artifacts/Korra_jar.xml deleted file mode 100644 index 952de355..00000000 --- a/.idea/artifacts/Korra_jar.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $USER_HOME$/Desktop/Korra/plugins - - - - - \ No newline at end of file diff --git a/.idea/artifacts/ProjectKorra_jar.xml b/.idea/artifacts/ProjectKorra_jar.xml deleted file mode 100644 index 3d1f8426..00000000 --- a/.idea/artifacts/ProjectKorra_jar.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $USER_HOME$/Desktop - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 9a8b7e5c..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index d8210482..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 9bd10ab0..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 5b9c10ea..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b8..00000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddf..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 208db198..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,693 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1421974199475 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Korra:jar - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.7 - - - - - - - - ProjectKorra - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ProjectKorra.iml b/ProjectKorra.iml deleted file mode 100644 index e6f31d81..00000000 --- a/ProjectKorra.iml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java b/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java index 166a66ad..0fbb0d66 100644 --- a/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java +++ b/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java @@ -1,27 +1,29 @@ package com.projectkorra.ProjectKorra.firebending; -import com.projectkorra.ProjectKorra.Ability.AvatarState; -import com.projectkorra.ProjectKorra.BendingPlayer; -import com.projectkorra.ProjectKorra.Methods; -import com.projectkorra.ProjectKorra.ProjectKorra; -import com.projectkorra.ProjectKorra.Utilities.ParticleEffect; -import com.projectkorra.ProjectKorra.earthbending.EarthBlast; -import com.projectkorra.ProjectKorra.waterbending.Plantbending; -import com.projectkorra.ProjectKorra.waterbending.WaterManipulation; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.entity.Entity; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.util.Vector; - import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.block.Furnace; +import org.bukkit.entity.Entity; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.util.Vector; + +import com.projectkorra.ProjectKorra.BendingPlayer; +import com.projectkorra.ProjectKorra.Methods; +import com.projectkorra.ProjectKorra.ProjectKorra; +import com.projectkorra.ProjectKorra.Ability.AvatarState; +import com.projectkorra.ProjectKorra.Utilities.ParticleEffect; +import com.projectkorra.ProjectKorra.earthbending.EarthBlast; +import com.projectkorra.ProjectKorra.waterbending.Plantbending; +import com.projectkorra.ProjectKorra.waterbending.WaterManipulation; + public class FireBlast { Random rand = new Random(); @@ -39,7 +41,7 @@ public class FireBlast { // public static long interval = 2000; public static byte full = 0x0; private static int ID = Integer.MIN_VALUE; - private static boolean canPowerFurnace = false; + private static boolean canPowerFurnace = true; static final int maxticks = 10000; public Location location; @@ -124,6 +126,10 @@ public class FireBlast { if (Methods.isSolid(block) || block.isLiquid()) { if (block.getType() == Material.FURNACE && canPowerFurnace) { + Furnace furnace = (Furnace) block.getState(); + furnace.setBurnTime((short) 800); + furnace.setCookTime((short) 800); + furnace.update(); } else if (FireStream.isIgnitable(player, block.getRelative(BlockFace.UP))) { ignite(location); } diff --git a/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java b/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java index 1d84841c..e5ecc7c2 100644 --- a/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java +++ b/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java @@ -1,9 +1,9 @@ package com.projectkorra.ProjectKorra.waterbending; -import com.projectkorra.ProjectKorra.Ability.AvatarState; -import com.projectkorra.ProjectKorra.Methods; -import com.projectkorra.ProjectKorra.ProjectKorra; -import com.projectkorra.ProjectKorra.TempBlock; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -14,9 +14,10 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; +import com.projectkorra.ProjectKorra.Methods; +import com.projectkorra.ProjectKorra.ProjectKorra; +import com.projectkorra.ProjectKorra.TempBlock; +import com.projectkorra.ProjectKorra.Ability.AvatarState; public class Torrent { @@ -58,7 +59,7 @@ public class Torrent { private int deflectdamage = DEFLECT_DAMAGE; private ArrayList blocks = new ArrayList(); - public ArrayList launchblocks = new ArrayList(); + private ArrayList launchblocks = new ArrayList(); private ArrayList hurtentities = new ArrayList(); public Torrent(Player player) {