From 937ff63bc6104525204210899903375e5893ccf6 Mon Sep 17 00:00:00 2001 From: MistPhizzle Date: Thu, 12 Jun 2014 22:17:59 -0400 Subject: [PATCH 1/2] Remove Case Sensitivity from /bending display --- src/com/projectkorra/ProjectKorra/Commands.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/projectkorra/ProjectKorra/Commands.java b/src/com/projectkorra/ProjectKorra/Commands.java index 3bbcf4fa..ae439d86 100644 --- a/src/com/projectkorra/ProjectKorra/Commands.java +++ b/src/com/projectkorra/ProjectKorra/Commands.java @@ -207,7 +207,7 @@ public class Commands { if (args.length == 2) { //bending display [Element] - if (Arrays.asList(airaliases).contains(args[1])) { + if (Arrays.asList(airaliases).contains(args[1].toLowerCase())) { if (AbilityModuleManager.airbendingabilities.isEmpty()) { s.sendMessage(ChatColor.GRAY + "There are no airbending abilities available."); return true; @@ -217,7 +217,7 @@ public class Commands { } return true; } - if (Arrays.asList(wateraliases).contains(args[1])) { + if (Arrays.asList(wateraliases).contains(args[1].toLowerCase())) { if (AbilityModuleManager.waterbendingabilities.isEmpty()) { s.sendMessage(ChatColor.AQUA + "There are no waterbending abilities available."); return true; @@ -227,7 +227,7 @@ public class Commands { } return true; } - if (Arrays.asList(earthaliases).contains(args[1])) { + if (Arrays.asList(earthaliases).contains(args[1].toLowerCase())) { if (AbilityModuleManager.earthbendingabilities.isEmpty()) { s.sendMessage(ChatColor.GREEN + "There are no earthbending abilities available."); return true; @@ -237,7 +237,7 @@ public class Commands { } return true; } - if (Arrays.asList(firealiases).contains(args[1])) { + if (Arrays.asList(firealiases).contains(args[1].toLowerCase())) { if (AbilityModuleManager.firebendingabilities.isEmpty()) { s.sendMessage(ChatColor.RED + "There are no firebending abilities available."); return true; @@ -247,7 +247,7 @@ public class Commands { } return true; } - if (Arrays.asList(chialiases).contains(args[1])) { + if (Arrays.asList(chialiases).contains(args[1].toLowerCase())) { if (AbilityModuleManager.chiabilities.isEmpty()) { s.sendMessage(ChatColor.GOLD + "There are no chiblocking abilities available."); return true; From 8e6c55b4558d13f9233950695b5e127bd435c154 Mon Sep 17 00:00:00 2001 From: MistPhizzle Date: Thu, 12 Jun 2014 22:51:07 -0400 Subject: [PATCH 2/2] Fix FireStream Stuff Dissipate correctly, etc. --- .../projectkorra/ProjectKorra/BendingManager.java | 15 +++++++++++++++ src/com/projectkorra/ProjectKorra/Commands.java | 2 ++ .../ProjectKorra/firebending/FireStream.java | 8 +------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/com/projectkorra/ProjectKorra/BendingManager.java b/src/com/projectkorra/ProjectKorra/BendingManager.java index 072179f4..981090ea 100644 --- a/src/com/projectkorra/ProjectKorra/BendingManager.java +++ b/src/com/projectkorra/ProjectKorra/BendingManager.java @@ -5,14 +5,17 @@ import java.util.concurrent.ConcurrentHashMap; import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.Material; import org.bukkit.World; import org.bukkit.WorldType; +import org.bukkit.block.Block; import org.bukkit.entity.Player; import com.projectkorra.ProjectKorra.airbending.AirPassive; import com.projectkorra.ProjectKorra.chiblocking.ChiPassive; import com.projectkorra.ProjectKorra.earthbending.EarthPassive; import com.projectkorra.ProjectKorra.firebending.FirePassive; +import com.projectkorra.ProjectKorra.firebending.FireStream; import com.projectkorra.ProjectKorra.waterbending.Plantbending; import com.projectkorra.ProjectKorra.waterbending.WaterPassive; @@ -42,6 +45,18 @@ public class BendingManager implements Runnable { EarthPassive.revertSands(); Plantbending.regrow(); handleDayNight(); + + for (int id: FireStream.instances.keySet()) { + FireStream.progress(id); + } + + for (Block block: FireStream.ignitedblocks.keySet()) { + if (block.getType() != Material.FIRE) { + FireStream.ignitedblocks.remove(block); + } + } + + FireStream.dissipateAll(); } catch (Exception e) { Methods.stopBending(); e.printStackTrace(); diff --git a/src/com/projectkorra/ProjectKorra/Commands.java b/src/com/projectkorra/ProjectKorra/Commands.java index ae439d86..883e3913 100644 --- a/src/com/projectkorra/ProjectKorra/Commands.java +++ b/src/com/projectkorra/ProjectKorra/Commands.java @@ -2,6 +2,7 @@ package com.projectkorra.ProjectKorra; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -252,6 +253,7 @@ public class Commands { s.sendMessage(ChatColor.GOLD + "There are no chiblocking abilities available."); return true; } + for (String st: AbilityModuleManager.chiabilities) { s.sendMessage(ChatColor.GOLD + st); } diff --git a/src/com/projectkorra/ProjectKorra/firebending/FireStream.java b/src/com/projectkorra/ProjectKorra/firebending/FireStream.java index 3123805d..5760ae11 100644 --- a/src/com/projectkorra/ProjectKorra/firebending/FireStream.java +++ b/src/com/projectkorra/ProjectKorra/firebending/FireStream.java @@ -61,10 +61,6 @@ public class FireStream { } public boolean progress() { -// if (Tools.isRegionProtectedFromBuild(player, Abilities.Blaze, location)) { -// remove(); -// return false; -// } if (System.currentTimeMillis() - time >= interval) { location = location.clone().add(direction); time = System.currentTimeMillis(); @@ -97,15 +93,13 @@ public class FireStream { if (Methods.isPlant(block)) { new Plantbending(block); } + block.setType(Material.FIRE); ignitedblocks.put(block, this.player); ignitedtimes.put(block, System.currentTimeMillis()); } public static boolean isIgnitable(Player player, Block block) { -// if (Tools.isRegionProtectedFromBuild(player, Abilities.Blaze, -// block.getLocation())) -// return false; Material[] overwriteable = { Material.SAPLING, Material.LONG_GRASS, Material.DEAD_BUSH, Material.YELLOW_FLOWER, Material.RED_ROSE,