From 19450405158460e0003684b5ef56c52e2fc3df71 Mon Sep 17 00:00:00 2001 From: Brendan Wilson Date: Sat, 31 Jan 2015 10:38:56 -0500 Subject: [PATCH] Removed fireblast furnace ignition Also changed torrent's launchblocks ArrayList to public. --- .idea/.name | 1 + .idea/artifacts/Korra_jar.xml | 8 + .idea/artifacts/ProjectKorra_jar.xml | 8 + .idea/compiler.xml | 22 + .idea/copyright/profiles_settings.xml | 3 + .idea/encodings.xml | 4 + .idea/misc.xml | 10 + .idea/modules.xml | 8 + .idea/scopes/scope_settings.xml | 5 + .idea/vcs.xml | 6 + .idea/workspace.xml | 556 ++++++++++++++++++ ProjectKorra.iml | 137 +++++ .../ProjectKorra/firebending/FireBlast.java | 32 +- .../ProjectKorra/waterbending/Torrent.java | 17 +- 14 files changed, 789 insertions(+), 28 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/artifacts/Korra_jar.xml create mode 100644 .idea/artifacts/ProjectKorra_jar.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 ProjectKorra.iml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..a3e9a9f8 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ProjectKorra \ No newline at end of file diff --git a/.idea/artifacts/Korra_jar.xml b/.idea/artifacts/Korra_jar.xml new file mode 100644 index 00000000..952de355 --- /dev/null +++ b/.idea/artifacts/Korra_jar.xml @@ -0,0 +1,8 @@ + + + $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 new file mode 100644 index 00000000..3d1f8426 --- /dev/null +++ b/.idea/artifacts/ProjectKorra_jar.xml @@ -0,0 +1,8 @@ + + + $USER_HOME$/Desktop + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..9a8b7e5c --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..d8210482 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..9bd10ab0 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..5b9c10ea --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..a8d7a94d --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,556 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1421974199475 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Korra:jar + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.7 + + + + + + + + ProjectKorra + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ProjectKorra.iml b/ProjectKorra.iml new file mode 100644 index 00000000..e6f31d81 --- /dev/null +++ b/ProjectKorra.iml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 66a4eb50..4943dde1 100644 --- a/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java +++ b/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java @@ -1,28 +1,26 @@ package com.projectkorra.ProjectKorra.firebending; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; - +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.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; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.concurrent.ConcurrentHashMap; public class FireBlast { @@ -41,7 +39,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 = true; + private static boolean canPowerFurnace = false; static final int maxticks = 10000; private Location location; @@ -126,10 +124,6 @@ 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 5767eab6..d99ca731 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 java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; - +import com.projectkorra.ProjectKorra.Ability.AvatarState; +import com.projectkorra.ProjectKorra.Methods; +import com.projectkorra.ProjectKorra.ProjectKorra; +import com.projectkorra.ProjectKorra.TempBlock; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -14,10 +14,9 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import com.projectkorra.ProjectKorra.Methods; -import com.projectkorra.ProjectKorra.ProjectKorra; -import com.projectkorra.ProjectKorra.TempBlock; -import com.projectkorra.ProjectKorra.Ability.AvatarState; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; public class Torrent { @@ -59,7 +58,7 @@ public class Torrent { private int deflectdamage = DEFLECT_DAMAGE; private ArrayList blocks = new ArrayList(); - private ArrayList launchblocks = new ArrayList(); + public ArrayList launchblocks = new ArrayList(); private ArrayList hurtentities = new ArrayList(); public Torrent(Player player) {