EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Change Spout Config file to only load if Spout is enabled.

Browse Source 
Removed unused imports.
This commit is contained in:
GJ
2012-05-23 14:31:03 -04:00
parent b88e076f27
commit 450e938092
13 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@ import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.config.TreasuresConfig;
import com.gmail.nossr50.config.mods.CustomBlocksConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
@ -130,7 +129,7 @@ public class Excavation {
Excavation.excavationProcCheck(block, player);
}
if (SpoutConfig.getInstance().spoutEnabled) {
if (mcMMO.p.spoutEnabled) {
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
}
}

5
src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
View File

@ -19,7 +19,6 @@ import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
import com.gmail.nossr50.util.Users;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
@ -333,7 +332,7 @@ public class Mining {
miningBlockCheck(player, block);
if (SpoutConfig.getInstance().spoutEnabled) {
if (mcMMO.p.spoutEnabled) {
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
}
}
@ -378,7 +377,7 @@ public class Mining {
miningBlockCheck(player, block);
if (SpoutConfig.getInstance().spoutEnabled) {
if (mcMMO.p.spoutEnabled) {
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
}
}

3
src/main/java/com/gmail/nossr50/skills/gathering/WoodCutting.java
View File

@ -14,7 +14,6 @@ import org.bukkit.event.block.BlockBreakEvent;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.datatypes.mods.CustomBlock;
@ -388,7 +387,7 @@ public class WoodCutting {
Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getInstance().getAbilityToolDamage());
}
if (SpoutConfig.getInstance().spoutEnabled) {
if (mcMMO.p.spoutEnabled) {
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
}
}

5
src/main/java/com/gmail/nossr50/skills/repair/Repair.java
View File

@ -13,7 +13,6 @@ import org.getspout.spoutapi.player.SpoutPlayer;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.SpoutConfig;
import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Skills;
@ -47,7 +46,7 @@ public class Repair {
Skills.XpCheckSkill(SkillType.REPAIR, player);
//CLANG CLANG
if (SpoutConfig.getInstance().spoutEnabled) {
if (mcMMO.p.spoutEnabled) {
SpoutSounds.playRepairNoise(player, mcMMO.p);
}
}
@ -243,7 +242,7 @@ public class Repair {
PlayerProfile PP = Users.getProfile(player);
if (!PP.getPlacedAnvil()) {
if (SpoutConfig.getInstance().spoutEnabled) {
if (mcMMO.p.spoutEnabled) {
SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
if (sPlayer.isSpoutCraftEnabled()) {