diff --git a/.gitignore b/.gitignore index 38c1b377..eb1f6c10 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,16 @@ pip-log.txt #Mr Developer .mr.developer.cfg + +########## +## test +########## + +#everything but the plugin, spigot, and a pre-accepted eula +test/server/crash-reports/ +test/server/logs/ +test/server/world*/ +test/server/*.json +test/server/*.yml +test/server/*.properties +test/server/plugins/*/ \ No newline at end of file diff --git a/extras/ant/build.xml b/extras/ant/build.xml new file mode 100644 index 00000000..c0abd91c --- /dev/null +++ b/extras/ant/build.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/com/projectkorra/projectkorra/ability/combo/ComboManager.java b/src/com/projectkorra/projectkorra/ability/combo/ComboManager.java index e51afe60..fdc26268 100644 --- a/src/com/projectkorra/projectkorra/ability/combo/ComboManager.java +++ b/src/com/projectkorra/projectkorra/ability/combo/ComboManager.java @@ -5,7 +5,6 @@ import com.projectkorra.projectkorra.GeneralMethods; import com.projectkorra.projectkorra.ProjectKorra; import com.projectkorra.projectkorra.airbending.AirCombo; import com.projectkorra.projectkorra.chiblocking.ChiCombo; -import com.projectkorra.projectkorra.earthbending.EarthCombo; import com.projectkorra.projectkorra.firebending.FireCombo; import com.projectkorra.projectkorra.util.ClickType; import com.projectkorra.projectkorra.waterbending.WaterCombo; @@ -160,13 +159,6 @@ public class ComboManager { comboAbilityList.add(new ComboAbility("Immobilize", immobilize, ChiCombo.class)); descriptions.put("Immobilize", "Immobilizes the opponent for several seconds."); instructions.put("Immobilize", "QuickStrike (Left Click) > SwiftKick (Left Click) > QuickStrike (Left Click) > QuickStrike (Left Click)"); - - ArrayList earthBurrow = new ArrayList(); - earthBurrow.add(new AbilityInformation("EarthTunnel", ClickType.LEFT_CLICK)); - earthBurrow.add(new AbilityInformation("Collapse", ClickType.SHIFT_DOWN)); - comboAbilityList.add(new ComboAbility("EarthBurrow", earthBurrow, EarthCombo.class)); - descriptions.put("EarthBurrow", "Sink into the ground to avoid attacks and confuse foes."); - instructions.put("EarthBurrow", "EarthTunnel (Left Click) > Collapse (Shift)"); startCleanupTask(); } @@ -193,8 +185,6 @@ public class ComboManager { new WaterCombo(player, comboAbil.getName()); else if (comboAbil.getComboType().equals(ChiCombo.class)) new ChiCombo(player, comboAbil.getName()); - else if (comboAbil.getComboType().equals(EarthCombo.class)) - new EarthCombo(player, comboAbil.getName()); else { for (ComboAbility ca : comboAbilityList) { if (comboAbil.getName().equals(ca.getName())) { diff --git a/test/server/eula.txt b/test/server/eula.txt new file mode 100644 index 00000000..0ec5e7fe --- /dev/null +++ b/test/server/eula.txt @@ -0,0 +1,3 @@ +#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula). +#Fri Aug 28 18:06:15 EDT 2015 +eula=true diff --git a/test/server/plugins/ProjectKorra.jar b/test/server/plugins/ProjectKorra.jar new file mode 100644 index 00000000..01d46510 Binary files /dev/null and b/test/server/plugins/ProjectKorra.jar differ diff --git a/test/server/spigot-1.8.8.jar b/test/server/spigot-1.8.8.jar new file mode 100644 index 00000000..0a47d3b6 Binary files /dev/null and b/test/server/spigot-1.8.8.jar differ