Browse Source

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

GJ 13 years ago
parent
commit
c032a27d63
3 changed files with 6 additions and 3 deletions
  1. 3 0
      Changelog.txt
  2. 1 1
      pom.xml
  3. 2 2
      src/main/java/com/gmail/nossr50/skills/Archery.java

+ 3 - 0
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

+ 1 - 1
pom.xml

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

+ 2 - 2
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$
 			}
 		}