EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Changed Ignition to add fire ticks rather than replace them. (Thanks

Browse Source 
bm01!)
This commit is contained in:
GJ 2012-03-02 10:11:54 -05:00
parent 353ceefd4e
commit c032a27d63
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -7,6 +7,9 @@ Key:
! Change ! Change
- Removal - Removal
Version 2.0.00-dev
! Changed Ignition to add fire ticks rather than replacing them.
Version 1.3.01 Version 1.3.01
= Fixed bug where Tree Feller had no cooldown = Fixed bug where Tree Feller had no cooldown
= Fixed bug with activating Skull Splitter after using Tree Feller = Fixed bug with activating Skull Splitter after using Tree Feller

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>1.3.01</version> <version>2.0.00-dev</version>
<name>mcMMO</name> <name>mcMMO</name>
<url>https://github.com/mcMMO-Dev/mcMMO</url> <url>https://github.com/mcMMO-Dev/mcMMO</url>
<issueManagement> <issueManagement>

4
src/main/java/com/gmail/nossr50/skills/Archery.java
View File

@ -60,14 +60,14 @@ public class Archery
Player defender = (Player)x; Player defender = (Player)x;
if(!Party.getInstance().inSameParty(attacker, defender)) if(!Party.getInstance().inSameParty(attacker, defender))
{ {
defender.setFireTicks(ignition); defender.setFireTicks(defender.getFireTicks() + ignition);
attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$ attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$
defender.sendMessage(mcLocale.getString("Combat.BurningArrowHit")); //$NON-NLS-1$ defender.sendMessage(mcLocale.getString("Combat.BurningArrowHit")); //$NON-NLS-1$
} }
} }
else else
{ {
x.setFireTicks(ignition); x.setFireTicks(x.getFireTicks() + ignition);
attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$ attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$
} }
} }