EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-17 01:23:39 +02:00
Code Issues Projects Releases Wiki Activity

Fix for stuff not breaking right.

Browse Source 
Still an issue with Herbalism & Green Terra, though.
This commit is contained in:
GJ 2012-03-09 18:27:03 -05:00
parent 0d14918946
commit 132388fe3f
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
View File

@ -207,16 +207,16 @@ public class mcBlockListener implements Listener {
if (PP.getHoePreparationMode() && Herbalism.canBeGreenTerra(block)) {
Skills.abilityCheck(player, SkillType.HERBALISM);
}
if (PP.getAxePreparationMode() && mat.equals(Material.LOG) && mcPermissions.getInstance().woodCuttingAbility(player)) { //Why are we checking the permissions here?
else if (PP.getAxePreparationMode() && mat.equals(Material.LOG) && mcPermissions.getInstance().woodCuttingAbility(player)) { //Why are we checking the permissions here?
Skills.abilityCheck(player, SkillType.WOODCUTTING);
}
if (PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(block)) {
else if (PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(block)) {
Skills.abilityCheck(player, SkillType.MINING);
}
if (PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(block)) {
else if (PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(block)) {
Skills.abilityCheck(player, SkillType.EXCAVATION);
}
if (PP.getFistsPreparationMode() && (Excavation.canBeGigaDrillBroken(block) || mat.equals(Material.SNOW))) {
else if (PP.getFistsPreparationMode() && (Excavation.canBeGigaDrillBroken(block) || mat.equals(Material.SNOW))) {
Skills.abilityCheck(player, SkillType.UNARMED);
}
}

2
src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
View File

@ -12,12 +12,10 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import org.bukkit.event.entity.EntityChangeBlockEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.entity.EntityEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityTameEvent;
import org.bukkit.event.entity.ExplosionPrimeEvent;

7
src/main/java/com/gmail/nossr50/skills/Skills.java
View File

@ -328,15 +328,14 @@ public class Skills
case GIGA_DRILL_BREAKER:
case SUPER_BREAKER:
case LEAF_BLOWER:
if (!m.blockBreakSimulate(block, player, true)) {
activate = false;
break;
}
if (!ability.blockCheck(block)) {
activate = false;
break;
}
break;
default:
activate = false;
break;
}
return activate;