From c05c1987cba25fa8bd416a2d71064e8de8c05226 Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Thu, 11 Feb 2016 22:00:32 +1300 Subject: [PATCH 1/2] Made Element Protected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Allows elements to be created by side-plugins --- src/com/projectkorra/projectkorra/Element.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/Element.java b/src/com/projectkorra/projectkorra/Element.java index e3a70196..c7c92fc5 100644 --- a/src/com/projectkorra/projectkorra/Element.java +++ b/src/com/projectkorra/projectkorra/Element.java @@ -32,7 +32,7 @@ public class Element { private String name; - private Element(String name) { + protected Element(String name) { this.name = name; ALL_ELEMENTS.put(name.toLowerCase(), this); } From 6c46e3d87e3c102dafa6448c4cf85f3f2248a02e Mon Sep 17 00:00:00 2001 From: Simplicitee Date: Thu, 11 Feb 2016 11:28:57 -0500 Subject: [PATCH 2/2] Update icebullet - Update icebullet right to use RIGHT_CLICK_BLOCK --- .../projectkorra/projectkorra/ability/util/ComboManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/ability/util/ComboManager.java b/src/com/projectkorra/projectkorra/ability/util/ComboManager.java index 4389fc78..20e913a8 100644 --- a/src/com/projectkorra/projectkorra/ability/util/ComboManager.java +++ b/src/com/projectkorra/projectkorra/ability/util/ComboManager.java @@ -127,7 +127,7 @@ public class ComboManager { iceBulletLeft.add(new AbilityInformation("IceBlast", ClickType.LEFT_CLICK)); COMBO_ABILITIES.put("IceBulletLeftClick", new ComboAbilityInfo("IceBulletLeftClick", iceBulletLeft, WaterCombo.class)); ArrayList iceBulletRight = new ArrayList<>(); - iceBulletRight.add(new AbilityInformation("IceBlast", ClickType.RIGHT_CLICK)); + iceBulletRight.add(new AbilityInformation("IceBlast", ClickType.RIGHT_CLICK_BLOCK)); COMBO_ABILITIES.put("IceBulletRightClick", new ComboAbilityInfo("IceBulletRightClick", iceBulletRight, WaterCombo.class)); ArrayList immobilize = new ArrayList<>();