瀏覽代碼

Fixing Daze, Counter-Attack, and Serrated Strikes hover tip messages containing {0}

nossr50 6 年之前
父節點
當前提交
71d1574a7d

+ 2 - 2
src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java

@@ -22,7 +22,7 @@ public class BleedTimerTask extends BukkitRunnable {
     private static Map<LivingEntity, BleedContainer> bleedList = new HashMap<LivingEntity, BleedContainer>();
 
     @Override
-    synchronized public void run() {
+    public void run() {
         Iterator<Entry<LivingEntity, BleedContainer>> bleedIterator = bleedList.entrySet().iterator();
 
         while (bleedIterator.hasNext()) {
@@ -108,7 +108,7 @@ public class BleedTimerTask extends BukkitRunnable {
      * @param entity LivingEntity to add
      * @param ticks Number of bleeding ticks
      */
-    public synchronized static void add(LivingEntity entity, LivingEntity attacker, int ticks, int bleedRank) {
+    public static void add(LivingEntity entity, LivingEntity attacker, int ticks, int bleedRank) {
         BleedContainer newBleedContainer = new BleedContainer(entity, ticks, bleedRank, attacker);
         bleedList.put(entity, newBleedContainer);
     }

+ 3 - 1
src/main/java/com/gmail/nossr50/util/ItemUtils.java

@@ -521,7 +521,9 @@ public final class ItemUtils {
         }
 
         for (Recipe recipe : mcMMO.p.getServer().getRecipesFor(item)) {
-            if (recipe instanceof FurnaceRecipe && ((FurnaceRecipe) recipe).getInput().getType().isBlock() && MaterialUtils.isOre(((FurnaceRecipe) recipe).getInput().getType())) {
+            if (recipe instanceof FurnaceRecipe
+                    && ((FurnaceRecipe) recipe).getInput().getType().isBlock()
+                    && MaterialUtils.isOre(((FurnaceRecipe) recipe).getInput().getType())) {
                 return true;
             }
         }

+ 3 - 3
src/main/resources/locale/locale_en_US.properties

@@ -159,7 +159,7 @@ Archery.SubSkill.SkillShot.Name=Skill Shot
 Archery.SubSkill.SkillShot.Description=Increases damage done with bows
 Archery.SubSkill.SkillShot.Stat=Skill Shot Bonus Damage
 Archery.SubSkill.Daze.Name=Daze
-Archery.SubSkill.Daze.Description=Disorients foes and deals {0} DMG
+Archery.SubSkill.Daze.Description=Disorients foes and deals extra DMG
 Archery.SubSkill.Daze.Stat=Daze Chance
 Archery.SubSkill.ArrowRetrieval.Name=Arrow Retrieval
 Archery.SubSkill.ArrowRetrieval.Description=Chance to retrieve arrows from corpses
@@ -391,10 +391,10 @@ Swords.Combat.Counter.Hit=[[DARK_RED]]Hit with a counter-attack!
 Swords.Combat.Countered=[[GREEN]]**COUNTER-ATTACKED**
 Swords.Combat.SS.Struck=[[DARK_RED]]Struck by SERRATED STRIKES!
 Swords.SubSkill.CounterAttack.Name=Counter Attack
-Swords.SubSkill.CounterAttack.Description=Reflect {0} of damage taken while blocking
+Swords.SubSkill.CounterAttack.Description=Reflect a portion of damage when attacked!
 Swords.SubSkill.CounterAttack.Stat=Counter Attack Chance
 Swords.SubSkill.SerratedStrikes.Name=Serrated Strikes
-Swords.SubSkill.SerratedStrikes.Description={0} DMG AoE, Bleed+ AoE
+Swords.SubSkill.SerratedStrikes.Description=Deal partial damage in an AOE with a chance to apply Rupture!
 Swords.SubSkill.SerratedStrikes.Stat=Serrated Strikes Length
 Swords.SubSkill.Rupture.Name=Rupture
 Swords.SubSkill.Rupture.Description=Apply a powerful bleed DoT