From 6c6fb117ea0485faccd5d65058d271a210f4e2a4 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Wed, 28 Mar 2012 22:24:32 -0400
Subject: [PATCH] Fixed bug where wolves spawned with Call of the Wild only had
 8 health

---
 Changelog.txt                                              | 1 +
 .../java/com/gmail/nossr50/listeners/mcPlayerListener.java | 2 +-
 src/main/java/com/gmail/nossr50/skills/Taming.java         | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 4266ba1ea..b6a3d8113 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -9,6 +9,7 @@ Key:
 
 Version 1.3.05-dev
  = Fixed bug with repairing wooden tools
+ = Fixed bug where spawned wolves only had 8 health.
  ! Changed Tree Feller to account for ability durability loss but not leaves.
 
 Version 1.3.04
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
index 055a48f87..a00a0207e 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
@@ -358,7 +358,7 @@ public class mcPlayerListener implements Listener {
         String command = message.substring(1).split(" ")[0];
 
         if (plugin.aliasMap.containsKey(command)) {
-            if(command.equalsIgnoreCase(plugin.aliasMap.get(command))) {
+            if (command.equalsIgnoreCase(plugin.aliasMap.get(command))) {
                 return;
             }
             event.getPlayer().chat(message.replaceFirst(command, plugin.aliasMap.get(command)));
diff --git a/src/main/java/com/gmail/nossr50/skills/Taming.java b/src/main/java/com/gmail/nossr50/skills/Taming.java
index 775e398e3..24c762916 100644
--- a/src/main/java/com/gmail/nossr50/skills/Taming.java
+++ b/src/main/java/com/gmail/nossr50/skills/Taming.java
@@ -243,7 +243,8 @@ public class Taming {
                             return;
                         }
                     }
-                }   
+                }
+
                 LivingEntity entity = player.getWorld().spawnCreature(player.getLocation(), type);
                 entity.setMetadata("mcmmoSummoned", new FixedMetadataValue(plugin, true));
                 ((Tameable) entity).setOwner(player);
@@ -252,6 +253,10 @@ public class Taming {
                     ((Ocelot) entity).setCatType(Ocelot.Type.getType(1 + random.nextInt(3)));
                 }
 
+                if (entity.getType().equals(EntityType.WOLF)) {
+                    entity.setHealth(entity.getMaxHealth());
+                }
+
                 player.setItemInHand(new ItemStack(summonItem, item.getAmount() - summonAmount));
                 player.sendMessage(mcLocale.getString("m.TamingSummon"));
             }