EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bug where wolves spawned with Call of the Wild only had 8 health

Browse Source
This commit is contained in:
GJ 2012-03-28 22:24:32 -04:00
parent 6fffe10c32
commit 6c6fb117ea
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -9,6 +9,7 @@ Key:
Version 1.3.05-dev Version 1.3.05-dev
= Fixed bug with repairing wooden tools = 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. ! Changed Tree Feller to account for ability durability loss but not leaves.
Version 1.3.04 Version 1.3.04

2
src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
View File

@ -358,7 +358,7 @@ public class mcPlayerListener implements Listener {
String command = message.substring(1).split(" ")[0]; String command = message.substring(1).split(" ")[0];
if (plugin.aliasMap.containsKey(command)) { if (plugin.aliasMap.containsKey(command)) {
if(command.equalsIgnoreCase(plugin.aliasMap.get(command))) { if (command.equalsIgnoreCase(plugin.aliasMap.get(command))) {
return; return;
} }
event.getPlayer().chat(message.replaceFirst(command, plugin.aliasMap.get(command))); event.getPlayer().chat(message.replaceFirst(command, plugin.aliasMap.get(command)));

7
src/main/java/com/gmail/nossr50/skills/Taming.java
View File

@ -243,7 +243,8 @@ public class Taming {
return; return;
} }
} }
} }
LivingEntity entity = player.getWorld().spawnCreature(player.getLocation(), type); LivingEntity entity = player.getWorld().spawnCreature(player.getLocation(), type);
entity.setMetadata("mcmmoSummoned", new FixedMetadataValue(plugin, true)); entity.setMetadata("mcmmoSummoned", new FixedMetadataValue(plugin, true));
((Tameable) entity).setOwner(player); ((Tameable) entity).setOwner(player);
@ -252,6 +253,10 @@ public class Taming {
((Ocelot) entity).setCatType(Ocelot.Type.getType(1 + random.nextInt(3))); ((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.setItemInHand(new ItemStack(summonItem, item.getAmount() - summonAmount));
player.sendMessage(mcLocale.getString("m.TamingSummon")); player.sendMessage(mcLocale.getString("m.TamingSummon"));
} }