diff --git a/Changelog.txt b/Changelog.txt index 22b5d05b0..cc2b490b6 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -7,6 +7,9 @@ Key: ! Change - Removal +Version 2.0.00-dev + ! Changed Ignition to add fire ticks rather than replacing them. + Version 1.3.01 = Fixed bug where Tree Feller had no cooldown = Fixed bug with activating Skull Splitter after using Tree Feller diff --git a/pom.xml b/pom.xml index c7e2d270c..dcd8ce265 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 1.3.01 + 2.0.00-dev mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/skills/Archery.java b/src/main/java/com/gmail/nossr50/skills/Archery.java index 5f7a871e1..5bacf8235 100644 --- a/src/main/java/com/gmail/nossr50/skills/Archery.java +++ b/src/main/java/com/gmail/nossr50/skills/Archery.java @@ -60,14 +60,14 @@ public class Archery Player defender = (Player)x; if(!Party.getInstance().inSameParty(attacker, defender)) { - defender.setFireTicks(ignition); + defender.setFireTicks(defender.getFireTicks() + ignition); attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$ defender.sendMessage(mcLocale.getString("Combat.BurningArrowHit")); //$NON-NLS-1$ } } else { - x.setFireTicks(ignition); + x.setFireTicks(x.getFireTicks() + ignition); attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$ } }