EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Generalized some taming stuff to work with Ocelots.

Browse Source
This commit is contained in:
GJ
2012-03-22 11:07:20 -04:00
parent cd53ba04b0
commit a630022bf0
12 changed files with 81 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,13 +101,13 @@ public class Taming {
}
/**
* Get the name of a wolf's owner.
* Get the name of a tameable animal's owner.
*
* @param theWolf The wolf whose owner's name to get
* @return the name of the wolf's owner, or "Offline Master" if the owner is offline
* @param beast The animal whose owner's name to get
* @return the name of the animal's owner, or "Offline Master" if the owner is offline
*/
private static String getOwnerName(Wolf theWolf) {
AnimalTamer tamer = theWolf.getOwner();
private static String getOwnerName(Tameable beast) {
AnimalTamer tamer = beast.getOwner();
if (tamer instanceof Player) {
Player owner = (Player) tamer;
@ -225,10 +225,20 @@ public class Taming {
if (item.getAmount() >= summonAmount) {
for (Entity x : player.getNearbyEntities(40, 40, 40)) {
if (x.getType().equals(type)) {
player.sendMessage(mcLocale.getString("m.TamingSummonFailed"));
return;
switch (type) {
case WOLF:
player.sendMessage(mcLocale.getString("m.TamingSummonWolfFailed"));
return;
case OCELOT:
player.sendMessage(mcLocale.getString("m.TamingSummonOcelotFailed"));
return;
default:
return;
}
}
}
}
LivingEntity entity = player.getWorld().spawnCreature(player.getLocation(), type);
entity.setMetadata("mcmmoSummoned", new FixedMetadataValue(plugin, true));
((Tameable) entity).setOwner(player);
@ -243,29 +253,25 @@ public class Taming {
}
/**
* Inspect a tamed animal for details.
* Inspect a tameable animal for details.
*
* @param event
* @param target
* @param event Event to modify
* @param target Animal to inspect
* @param inspector Player inspecting the animal
*/
public static void beastLore(EntityDamageByEntityEvent event, LivingEntity target, Player attacker) {
//TODO: Make this work for Ocelots
if (target.getType().equals(EntityType.WOLF)) {
Wolf wolf = (Wolf) target;
public static void beastLore(EntityDamageByEntityEvent event, LivingEntity target, Player inspector) {
if (target instanceof Tameable) {
Tameable beast = (Tameable) target;
String message = mcLocale.getString("Combat.BeastLore") + " ";
int health = wolf.getHealth();
int health = target.getHealth();
event.setCancelled(true);
if (wolf.isTamed()) {
message = message.concat(mcLocale.getString("Combat.BeastLoreOwner", new Object[] {getOwnerName(wolf)}) + " ");
message = message.concat(mcLocale.getString("Combat.BeastLoreHealthWolfTamed", new Object[] {health}));
}
else {
message = message.concat(mcLocale.getString("Combat.BeastLoreHealthWolf", new Object[] {health}));
if (beast.isTamed()) {
message = message.concat(mcLocale.getString("Combat.BeastLoreOwner", new Object[] {getOwnerName(beast)}) + " ");
}
attacker.sendMessage(message);
message = message.concat(mcLocale.getString("Combat.BeastLoreHealth", new Object[] {health, target.getMaxHealth()}));
inspector.sendMessage(message);
}
}
}