From c6ea32f0b09e3b6c1dbd6c302ae409061e937cba Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Sun, 19 Jan 2014 19:40:33 +0100
Subject: [PATCH] Added Ender Dragon, Wither, and Witch to combat experience
 multipliers

They do not give any XP by default.

Fixes #1763
---
 Changelog.txt                                                | 1 +
 src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java | 3 +++
 src/main/resources/experience.yml                            | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/Changelog.txt b/Changelog.txt
index 910c52193..5c196f14b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -19,6 +19,7 @@ Version 1.4.08-dev
  + Added party alliances, two parties can now team up. Allies share party chat and cannot harm each other.
  + Added new experience bonus perk 'mcmmo.perks.xp.10percentboost.<skillname>' multiplies incoming XP by 1.1
  + Added new experience bonus perk 'mcmmo.perks.xp.customboost.<skillname>' multiplies incoming XP by the boost amount defined in the experience config
+ + Added Ender Dragon, Wither, and Witch to combat experience multipliers - they do not give XP by default
  = Fixed bug where LeafBlower permissions were ignored
  = Fixed bug with toggle commands not properly displaying the success message.
  = Fixed IllegalArgumentException caused by an empty Fishing treasure category
diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
index 728297fcf..8a5547c94 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -439,6 +439,7 @@ public final class CombatUtils {
                     case BLAZE:
                     case CAVE_SPIDER:
                     case CREEPER:
+                    case ENDER_DRAGON:
                     case ENDERMAN:
                     case GHAST:
                     case GIANT:
@@ -447,6 +448,8 @@ public final class CombatUtils {
                     case SILVERFISH:
                     case SLIME:
                     case SPIDER:
+                    case WITCH:
+                    case WITHER:
                     case ZOMBIE:
                         baseXP = ExperienceConfig.getInstance().getCombatXP(type);
                         break;
diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml
index 527c6425a..cbd58644e 100644
--- a/src/main/resources/experience.yml
+++ b/src/main/resources/experience.yml
@@ -173,5 +173,8 @@ Experience:
             Silverfish: 3.0
             Blaze: 3.0
             Magma_Cube: 2.0
+            Ender_Dragon: 0.0
+            Wither: 0.0
+            Witch: 0.0
             Iron_Golem: 2.0
             Wither_Skeleton: 4.0