Fixed error related to Bleed, fixed missing default XP values for Herbalism and Woodcutting

Changelog.txt

@@ -8,9 +8,21 @@ Key:
   - Removal
 
 Version 2.1.46
+    Fixed an error where bleed was setting health outside minimum values
+    [See NOTE] Fixed a bug where Creepers and Zombies were not dropping the correct heads from Shake (thanks Zed-I)
+    [See NOTE] Fixed a bug where salvage was not returning the correct amount of materials for AXE items (thanks Zed-I)
+    [See NOTE] Added missing STRIPPED_WOOD entries to experience.yml for Woodcutting
+    [See NOTE] Added about 15-20 missing entries to experience.yml for coral to Herbalism
     Fixed a bug where admin chat from console would fail to send (thanks OverCrave)
+    Reduced default XP values for DEAD_* coral plants from 30 -> 10
     Updated hu_HU locale (thanks andris155)
 
+    NOTE: These bugfixes were related to default config values, to receive these changes you can either delete experience.yml, treasures.yml and salvage.vanilla.yml to generate new ones or make the necessary edits.
+    This is what the files should look like after being edited.
+    Experience Correct Default Config - https://paste.gg/p/anonymous/ff695df1417e4232957a3d176fd14ed4
+    Salvage Correct Default Config - https://paste.gg/p/anonymous/c4eb2f4e66ed444e872021051760f3be
+    Treasures Correct Default Config - https://paste.gg/p/anonymous/b0120210f8c149958ca0303c68c19ebd
+
 Version 2.1.45
     mcMMO will now check to see if the server version is incompatible and inform server admins on how to fix the problem.
 

src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -246,7 +246,7 @@ public class EntityListener implements Listener {
             if(defender instanceof Player)
             {
                 LivingEntity defLive = (LivingEntity) defender;
-                defLive.setHealth(defLive.getHealth() - event.getFinalDamage());
+                defLive.setHealth(Math.max(0, (defLive.getHealth() - event.getFinalDamage())));
                 event.setCancelled(true);
             }
 

src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -451,9 +451,6 @@ public final class CombatUtils {
         }
 
         target.setMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, mcMMO.metadataValue);
-
-
-
         target.damage(damage, attacker);
 
 //        //IFrame storage

src/main/resources/experience.yml

@@ -252,6 +252,12 @@ Experience:
         Stripped_Jungle_Log: 100
         Stripped_Acacia_Log: 90
         Stripped_Dark_Oak_Log: 90
+        Stripped_Oak_Wood: 70
+        Stripped_Spruce_Wood: 80
+        Stripped_Birch_Wood: 90
+        Stripped_Jungle_Wood: 100
+        Stripped_Acacia_Wood: 90
+        Stripped_Dark_Oak_Wood: 90
         Oak_Wood: 70
         Spruce_Wood: 70
         Birch_Wood: 70
@@ -266,16 +272,36 @@ Experience:
         Tall_Seagrass: 10
         Kelp: 3
         Kelp_Plant: 3
-        Tube_Coral_Fan: 80
+        Tube_Coral: 80
         Brain_Coral: 90
         Bubble_Coral: 75
         Fire_Coral: 120
         Horn_Coral: 175
-        Dead_Tube_Coral: 30
+        Tube_Coral_Fan: 80
-        Dead_Brain_Coral: 30
+        Brain_Coral_Fan: 90
-        Dead_Bubble_Coral: 30
+        Bubble_Coral_Fan: 75
-        Dead_Fire_Coral: 30
+        Fire_Coral_Fan: 120
-        Dead_Horn_Coral: 30
+        Horn_Coral_Fan: 175
+        Tube_Coral_Wall_Fan: 80
+        Brain_Coral_Wall_Fan: 90
+        Bubble_Coral_Wall_Fan: 75
+        Fire_Coral_Wall_Fan: 120
+        Horn_Coral_Wall_Fan: 175
+        Dead_Tube_Coral: 10
+        Dead_Brain_Coral: 10
+        Dead_Bubble_Coral: 10
+        Dead_Fire_Coral: 10
+        Dead_Horn_Coral: 10
+        Dead_Tube_Coral_Fan: 10
+        Dead_Brain_Coral_Fan: 10
+        Dead_Bubble_Coral_Fan: 10
+        Dead_Fire_Coral_Fan: 10
+        Dead_Horn_Coral_Fan: 10
+        Dead_Tube_Coral_Wall_Fan: 10
+        Dead_Brain_Coral_Wall_Fan: 10
+        Dead_Bubble_Coral_Wall_Fan: 10
+        Dead_Fire_Coral_Wall_Fan: 10
+        Dead_Horn_Coral_Wall_Fan: 10
         Allium: 300
         Azure_Bluet: 150
         Beetroots_Ripe: 50