EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bug where Skull Splitter & Serrated Strikes could be used without

Browse Source 
permissions.
This commit is contained in:
GJ 2012-03-29 18:38:59 -04:00
parent 8bbee7fe06
commit e9d1297c17
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -13,6 +13,7 @@ Version 1.3.05-dev
= Fixed bug with repairing wooden tools = Fixed bug with repairing wooden tools
= Fixed bug where spawned wolves only had 8 health. = Fixed bug where spawned wolves only had 8 health.
= Fixed bug where rare Treasures from Excavation were dropping too often = Fixed bug where rare Treasures from Excavation were dropping too often
= Fixed bug where Skull Splitter & Serrated Strikes could be used without permissions.
! Changed Tree Feller to account for ability durability loss but not leaves. ! Changed Tree Feller to account for ability durability loss but not leaves.
! Changed bypass node for Arcane Forging to not default to true for OPs ! Changed bypass node for Arcane Forging to not default to true for OPs

4
src/main/java/com/gmail/nossr50/Combat.java
View File

@ -65,7 +65,7 @@ public class Combat {
Swords.bleedCheck(attacker, target, plugin); Swords.bleedCheck(attacker, target, plugin);
} }
if (PPa.getAbilityMode(AbilityType.SERRATED_STRIKES)) { if (PPa.getAbilityMode(AbilityType.SERRATED_STRIKES) && mcPermissions.getInstance().serratedStrikes(attacker)) {
applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.SWORDS); applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.SWORDS);
} }
@ -84,7 +84,7 @@ public class Combat {
Axes.impact(attacker, target, event); Axes.impact(attacker, target, event);
} }
if (PPa.getAbilityMode(AbilityType.SKULL_SPLIITER)) { if (PPa.getAbilityMode(AbilityType.SKULL_SPLIITER) && mcPermissions.getInstance().skullSplitter(attacker)) {
applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.AXES); applyAbilityAoE(attacker, target, event.getDamage(), plugin, SkillType.AXES);
} }

2
src/main/java/com/gmail/nossr50/skills/Excavation.java
View File

@ -104,7 +104,7 @@ public class Excavation {
for (ExcavationTreasure treasure : treasures) { for (ExcavationTreasure treasure : treasures) {
if (skillLevel >= treasure.getDropLevel()) { if (skillLevel >= treasure.getDropLevel()) {
if (random.nextDouble() * 100.0d <= treasure.getDropChance()) { if (random.nextDouble() * 100 <= treasure.getDropChance()) {
xp += treasure.getXp(); xp += treasure.getXp();
is.add(treasure.getDrop()); is.add(treasure.getDrop());
} }

2
src/main/java/com/gmail/nossr50/skills/Fishing.java
View File

@ -100,7 +100,7 @@ public class Fishing {
if (LoadProperties.fishingDrops) { if (LoadProperties.fishingDrops) {
FishingTreasure treasure = rewards.get(random.nextInt(rewards.size())); FishingTreasure treasure = rewards.get(random.nextInt(rewards.size()));
if (random.nextDouble() * 100.0d <= treasure.getDropChance()) { if (random.nextDouble() * 100 <= treasure.getDropChance()) {
Users.getProfile(player).addXP(SkillType.FISHING, treasure.getXp()); Users.getProfile(player).addXP(SkillType.FISHING, treasure.getXp());
theCatch.setItemStack(treasure.getDrop()); theCatch.setItemStack(treasure.getDrop());
} }