From 6efc69d4052df9f6031bb4f40d6455b86d77f890 Mon Sep 17 00:00:00 2001 From: MistPhizzle Date: Sat, 26 Jul 2014 12:00:34 -0400 Subject: [PATCH] 1.3.0 BETA 4 --- .classpath | 1 - .../ProjectKorra/firebending/FireBlast.java | 39 +------------------ .../ProjectKorra/waterbending/WaterSpout.java | 3 +- src/plugin.yml | 2 +- 4 files changed, 4 insertions(+), 41 deletions(-) diff --git a/.classpath b/.classpath index 5a84bf1f..6b746735 100644 --- a/.classpath +++ b/.classpath @@ -11,6 +11,5 @@ - diff --git a/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java b/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java index 87a8103b..1b953d04 100644 --- a/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java +++ b/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java @@ -129,46 +129,11 @@ public class FireBlast { return false; } - // if (player.isSneaking() - // && Methods.getBendingAbility(player) == Abilities.AirBlast) { - // new AirBlast(player); - // } - Block block = location.getBlock(); - // for (Block testblock : Methods.getBlocksAroundPoint(location, - // affectingradius)) { - // if (testblock.getType() == Material.FIRE) { - // testblock.setType(Material.AIR); - // testblock.getWorld().playEffect(testblock.getLocation(), - // Effect.EXTINGUISH, 0); - // } - // if (((block.getType() == Material.LEVER) || (block.getType() == - // Material.STONE_BUTTON)) - // && !affectedlevers.contains(block)) { - // EntityHuman eH = ((CraftPlayer) player).getHandle(); - // - // net.minecraft.server.Block.byId[block.getTypeId()].interact( - // ((CraftWorld) block.getWorld()).getHandle(), - // block.getX(), block.getY(), block.getZ(), eH); - // - // affectedlevers.add(block); - // } - // } + if (Methods.isSolid(block) || block.isLiquid()) { if (block.getType() == Material.FURNACE && canPowerFurnace) { - // BlockState state = block.getState(); - // Furnace furnace = (Furnace) state; - // FurnaceInventory inv = furnace.getInventory(); - // if (inv.getFuel() == null) { - // ItemStack temp = inv.getSmelting(); - // ItemStack tempfuel = new ItemStack(Material.WOOD_AXE, 1); - // ItemStack tempsmelt = new ItemStack(Material.COBBLESTONE); - // inv.setFuel(tempfuel); - // inv.setSmelting(tempsmelt); - // state.update(true); - // inv.setSmelting(temp); - // state.update(true); - // } + } else if (FireStream.isIgnitable(player, block.getRelative(BlockFace.UP))) { ignite(location); } diff --git a/src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java b/src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java index 0c2d177d..d8f9fb1e 100644 --- a/src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java +++ b/src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java @@ -10,12 +10,11 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffectType; -import chiblocking.Paralyze; - import com.projectkorra.ProjectKorra.Flight; import com.projectkorra.ProjectKorra.Methods; import com.projectkorra.ProjectKorra.ProjectKorra; import com.projectkorra.ProjectKorra.TempBlock; +import com.projectkorra.ProjectKorra.chiblocking.Paralyze; public class WaterSpout { diff --git a/src/plugin.yml b/src/plugin.yml index cd7f66a0..c284bee9 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: ProjectKorra author: ProjectKorra -version: 1.3.0 BETA 3 +version: 1.3.0 BETA 4 main: com.projectkorra.ProjectKorra.ProjectKorra commands: projectkorra: