Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 08:09:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable

Browse Source 
# Conflicts:
#	Changelog.txt
#	pom.xml
#	src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
This commit is contained in:
nossr50 2019-04-09 17:49:56 -07:00
commit 2ef10afce3
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changelog.txt
View File

@ -155,6 +155,12 @@ Version 2.2.0
Added API method to grab the level cap of a skill by its PrimarySkillType ENUM definition
Added API method to check if a skill was being level capped
Version 2.1.39
Salvaging an item should now only play the item break sound (was playing the anvil sound simultaneously before)
Fixed bug where Tall_Grass was not giving full XP
Added Tall_Seagrass and Seagrass to experience.yml under Herbalism (update your configs)
NOTE: This is what your herbalism section in experience.yml should look like - https://paste.gg/p/anonymous/d5b03bd56e8442f2836f8a954d2974de
Version 2.1.38
Roll XP cooldown down from 60 seconds to 10
Updated pt_BR localization (thanks FabioZumbi12)

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

@ -124,8 +124,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)) {
@ -174,6 +173,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

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

@ -128,8 +128,13 @@ public class SalvageManager extends SkillManager {
Misc.dropItems(location, salvageResults, 1);
// BWONG BWONG BWONG - CLUNK!
<<<<<<< HEAD
if (mcMMO.getConfigManager().getConfigSalvage().getGeneral().isAnvilUseSounds()) {
SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
=======
if (Config.getInstance().getSalvageAnvilUseSoundsEnabled()) {
// SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
>>>>>>> f1204f8a2aa8b402dc84a4b76c46665e02edb767
SoundManager.sendSound(player, player.getLocation(), SoundType.ITEM_BREAK);
//player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, 1.0F, 1.0F);

2
src/main/resources/experience.yml
View File

@ -261,6 +261,8 @@ Experience:
Brown_Mushroom_Block: 70
Mushroom_Stem: 80
Herbalism:
Seagrass: 10
Tall_Seagrass: 10
Kelp: 3
Kelp_Plant: 3
Tube_Coral_Fan: 80