From adffea1d528d8725887333f6ad3dc144af166584 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Fri, 22 Jun 2012 10:13:37 -0400
Subject: [PATCH] Increased the seconds for activation time perk.

---
 Changelog.txt                                    |  2 +-
 src/main/java/com/gmail/nossr50/util/Skills.java | 10 +++++-----
 src/main/resources/plugin.yml                    | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 299b6bbfc..f5d8a4a8c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -11,7 +11,7 @@ Version 1.3.09
  + Added compatibility with AntiCheat (Which I highly recommend to prevent cheating)
  + Added several permission nodes to give individual users special perks (Double/Triple/Quadruple XP)
  + Added reduced cooldown permission nodes as donor perks (1/4, 1/3, 1/2 cooldown)
- + Added increased activation time permissions nodes as donor perks (+2, +4, and +6 seconds)
+ + Added increased activation time permissions nodes as donor perks (+4, +8, and +12 seconds)
  + Added API for plugins to add custom tools directly via Spout - repair / abilities do not work ATM
  + Added offline party members to the list displayed by /party
  + Added possibility to kick offline members from parties
diff --git a/src/main/java/com/gmail/nossr50/util/Skills.java b/src/main/java/com/gmail/nossr50/util/Skills.java
index cb72b83b2..f0be1920a 100644
--- a/src/main/java/com/gmail/nossr50/util/Skills.java
+++ b/src/main/java/com/gmail/nossr50/util/Skills.java
@@ -404,15 +404,15 @@ public class Skills {
 
             int ticks = 2 + (PP.getSkillLevel(type) / 50);
 
-            if (player.hasPermission("mcmmo.perks.activationtime.sixseconds")) {
-                ticks = ticks + 6;
+            if (player.hasPermission("mcmmo.perks.activationtime.twelveseconds")) {
+                ticks = ticks + 12;
+            }
+            else if (player.hasPermission("mcmmo.perks.activationtime.eightseconds")) {
+                ticks = ticks + 8;
             }
             else if (player.hasPermission("mcmmo.perks.activationtime.fourseconds")) {
                 ticks = ticks + 4;
             }
-            else if (player.hasPermission("mcmmo.perks.activationtime.twoseconds")) {
-                ticks = ticks + 2;
-            }
 
             int maxTicks = ability.getMaxTicks();
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 58ba618b1..7d7e454f9 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -142,18 +142,18 @@ permissions:
         default: false
         description: Increased activation time perks typically given to donors or VIPs
         children:
-            mcmmo.perks.activationtime.sixseconds: true
+            mcmmo.perks.activationtime.twelveseconds: true
+            mcmmo.perks.activationtime.eightseconds: true
             mcmmo.perks.activationtime.fourseconds: true
-            mcmmo.perks.activationtime.twoseconds: true
-    mcmmo.perks.activationtime.sixseconds:
+    mcmmo.perks.activationtime.twelveseconds:
         default: false
-        description: Increases activation time by 6 seconds
+        description: Increases activation time by 12 seconds
+    mcmmo.perks.activationtime.eightseconds:
+        default: false
+        description: Increases activation time by 8 seconds
     mcmmo.perks.activationtime.fourseconds:
         default: false
         description: Increases activation time by 4 seconds
-    mcmmo.perks.activationtime.twoseconds:
-        default: false
-        description: Increases activation time by 2 seconds
     mcmmo.perks.cooldowns:
         default: false
         description: Reduced cooldown perks typically given to donors or VIPs