Browse Source

Fix some WG logic + Archaeology stat display

nossr50 6 years ago
parent
commit
2dda0bf27a

+ 1 - 0
Changelog.txt

@@ -9,6 +9,7 @@ Version 2.1.89
     When finding a treasure via Excavation players have a 1-8% chance to have a small amount vanilla experience orbs to be found alongside the treasure, the chance and number of orbs are based on the players Archaeology rank
     Tweaked the locale string 'Excavation.SubSkill.Archaeology.Description'
     Added locale string 'Excavation.SubSkill.Archaeology.Stat'
+    Added locale string 'Excavation.SubSkill.Archaeology.Stat.Extra'
 
     When using WorldGuard (WG) with mcMMO, mcMMO now examines WG more carefully to determine if it is a compatible version or not, see the notes. Keep in mind WG is optional and not needed to run mcMMO.
     Fixed a bug that could result in Tree Feller failing to remove parts of a tree in snowy biomes. (This fix won't apply retroactively to old trees, see the notes)

+ 2 - 2
src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java

@@ -43,9 +43,9 @@ public class WorldGuardUtils {
         if(detectedIncompatibleWG)
             return false;
 
-        WorldGuardPlugin plugin = getWorldGuard();
+        WorldGuardPlugin worldGuardPlugin = getWorldGuard();
 
-        return plugin == null;
+        return isLoaded;
     }
 
     /**

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

@@ -218,7 +218,8 @@ Excavation.SubSkill.GigaDrillBreaker.Description=3x Drop Rate, 3x EXP, +Speed
 Excavation.SubSkill.GigaDrillBreaker.Stat=Giga Drill Breaker Duration
 Excavation.SubSkill.Archaeology.Name=Archaeology
 Excavation.SubSkill.Archaeology.Description=Unearth the secrets of the land! Find treasure and experience orbs!
-Excavation.SubSkill.Archaeology.Stat={0}% chance to find {1} experience orbs alongside treasure
+Excavation.SubSkill.Archaeology.Stat=Archaelogy Experience Orb Rate
+Excavation.SubSkill.Archaeology.Stat.Extra={0}% chance to find {1} experience orbs alongside treasure
 Excavation.Listener=Excavation:
 Excavation.SkillName=EXCAVATION
 Excavation.Skills.GigaDrillBreaker.Off=**Giga Drill Breaker has worn off**