From f1204f8a2aa8b402dc84a4b76c46665e02edb767 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Tue, 9 Apr 2019 16:32:42 -0700
Subject: [PATCH] 2.1.39 - Added Seagrass/Tall_Seagrass to experience tables
 Salvage should sound a bit different to Repair now Fixes #3863 #3862

---
 Changelog.txt                                            | 6 ++++++
 pom.xml                                                  | 2 +-
 .../gmail/nossr50/skills/herbalism/HerbalismManager.java | 9 +++++++--
 .../com/gmail/nossr50/skills/salvage/SalvageManager.java | 2 +-
 src/main/resources/experience.yml                        | 2 ++
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index e4544e808..7570bd3f8 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,6 +7,12 @@ Key:
   ! Change
   - Removal
 
+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)
diff --git a/pom.xml b/pom.xml
index db20bde63..52390ed8b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.38</version>
+    <version>2.1.39</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
index afb280e98..81738fa55 100644
--- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
@@ -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
diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
index 9ff30053a..68471b948 100644
--- a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
@@ -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);
diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml
index 93bba80d1..f668c5d34 100644
--- a/src/main/resources/experience.yml
+++ b/src/main/resources/experience.yml
@@ -262,6 +262,8 @@ Experience:
         Brown_Mushroom_Block: 70
         Mushroom_Stem: 80
     Herbalism:
+        Seagrass: 10
+        Tall_Seagrass: 10
         Kelp: 3
         Kelp_Plant: 3
         Tube_Coral_Fan: 80