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

2.1.39 - Added Seagrass/Tall_Seagrass to experience tables

Browse Source 
Salvage should sound a bit different to Repair now
Fixes #3863 #3862
This commit is contained in:
nossr50
2019-04-09 16:32:42 -07:00
parent f7b07899c1
commit f1204f8a2a
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@ -125,8 +125,7 @@ public class HerbalismManager extends SkillManager {
public void herbalismBlockCheck(BlockState blockState) {
Player player = getPlayer();
Material material = blockState.getType();
boolean oneBlockPlant = !(material == Material.CACTUS || material == Material.CHORUS_PLANT
|| material == Material.SUGAR_CANE || material == Material.KELP_PLANT || material == Material.KELP);
boolean oneBlockPlant = isOneBlockPlant(material);
// Prevents placing and immediately breaking blocks for exp
if (oneBlockPlant && mcMMO.getPlaceStore().isTrue(blockState)) {
@ -176,6 +175,12 @@ public class HerbalismManager extends SkillManager {
applyXpGain(xp, XPGainReason.PVE);
}
public boolean isOneBlockPlant(Material material) {
return !(material == Material.CACTUS || material == Material.CHORUS_PLANT
|| material == Material.SUGAR_CANE || material == Material.KELP_PLANT || material == Material.KELP
|| material == Material.TALL_SEAGRASS || material == Material.TALL_GRASS);
}
/**
* Check for success on herbalism double drops
* @param blockState target block state

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

@ -131,7 +131,7 @@ public class SalvageManager extends SkillManager {
// BWONG BWONG BWONG - CLUNK!
if (Config.getInstance().getSalvageAnvilUseSoundsEnabled()) {
SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
// SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
SoundManager.sendSound(player, player.getLocation(), SoundType.ITEM_BREAK);
//player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, 1.0F, 1.0F);