Sfoglia il codice sorgente

Merge pull request #4027 from QuantumToasted/master

Add additional info about horse speed in Beast Lore
Robert A. C 5 anni fa
parent
commit
861552bcd8

+ 7 - 0
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java

@@ -27,6 +27,7 @@ import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.*;
 import org.bukkit.inventory.ItemStack;
 
@@ -254,6 +255,12 @@ public class TamingManager extends SkillManager {
         }
 
         message = message.concat(LocaleLoader.getString("Combat.BeastLoreHealth", target.getHealth(), target.getMaxHealth()));
+
+        if (beast instanceof AbstractHorse) {
+            AbstractHorse horse = (AbstractHorse) beast;
+            message = message.concat("\n" + LocaleLoader.getString("Combat.BeastLoreHorseSpeed", horse.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).getValue() * 43));
+        }
+
         player.sendMessage(message);
     }
 

+ 1 - 0
src/main/resources/locale/locale_en_US.properties

@@ -555,6 +555,7 @@ Combat.ArrowDeflect=[[WHITE]]**ARROW DEFLECT**
 Combat.BeastLore=[[GREEN]]**BEAST LORE**
 Combat.BeastLoreHealth=[[DARK_AQUA]]Health ([[GREEN]]{0}[[DARK_AQUA]]/{1})
 Combat.BeastLoreOwner=[[DARK_AQUA]]Owner ([[RED]]{0}[[DARK_AQUA]])
+Combat.BeastLoreHorseSpeed=[[DARK_AQUA]]Horse Movement Speed ([[GREEN]]{0} blocks/s[[DARK_AQUA]])
 Combat.Gore=[[GREEN]]**GORED**
 Combat.StruckByGore=**YOU HAVE BEEN GORED**
 Combat.TargetDazed=Target was [[DARK_RED]]Dazed