浏览代码

Acrobatics XP from falling no longer requires the Roll subskill

nossr50 4 年之前
父节点
当前提交
aa734c8b1a
共有 2 个文件被更改,包括 5 次插入0 次删除
  1. 1 0
      Changelog.txt
  2. 4 0
      src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java

+ 1 - 0
Changelog.txt

@@ -1,4 +1,5 @@
 Version 2.1.183
 Version 2.1.183
+    Players now gain Acrobatics XP from falling even if they don't have the Roll permission node (checks for Acrobatics skill permission)
     treasures.yml now has separate settings for Drop_Level for Standard/Retro mode (see notes / this change is automatic)
     treasures.yml now has separate settings for Drop_Level for Standard/Retro mode (see notes / this change is automatic)
     Updated Russian locale (thanks ImDaniX)
     Updated Russian locale (thanks ImDaniX)
     Added Donkeys to beat lore (thanks QuantumToasted)
     Added Donkeys to beat lore (thanks QuantumToasted)

+ 4 - 0
src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java

@@ -6,6 +6,7 @@ import com.gmail.nossr50.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.mcMMO;
@@ -83,6 +84,9 @@ public class Roll extends AcrobaticsSubSkill {
                     entityDamageEvent.setCancelled(true);
                     entityDamageEvent.setCancelled(true);
                     return true;
                     return true;
                 }
                 }
+            } else if(Permissions.skillEnabled(player, PrimarySkillType.ACROBATICS)) {
+                //Give XP Anyways
+                SkillUtils.applyXpGain(mcMMOPlayer, getPrimarySkill(), calculateRollXP(player, ((EntityDamageEvent) event).getFinalDamage(), false), XPGainReason.PVE);
             }
             }
         }
         }