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

Moved wolf damage checks to Taming.java

Browse Source
This commit is contained in:
GJ 2012-02-26 02:38:07 -05:00
parent 3a1ee58339
commit a7f259ea3c
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
View File

@ -43,7 +43,6 @@ import com.gmail.nossr50.mcPermissions;
import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.skills.Acrobatics; import com.gmail.nossr50.skills.Acrobatics;
import com.gmail.nossr50.skills.BlastMining; import com.gmail.nossr50.skills.BlastMining;
@ -93,32 +92,7 @@ public class mcEntityListener implements Listener
if(entityliving.getNoDamageTicks() < entityliving.getMaximumNoDamageTicks()/2.0F) if(entityliving.getNoDamageTicks() < entityliving.getMaximumNoDamageTicks()/2.0F)
{ {
if(entity instanceof Wolf && ((Wolf)entity).isTamed() && Taming.getOwner(((Wolf)entity), plugin) != null) if(entity instanceof Wolf && ((Wolf)entity).isTamed() && Taming.getOwner(((Wolf)entity), plugin) != null)
{ Taming.preventDamage(event, plugin);
Wolf theWolf = (Wolf) event.getEntity();
Player master = Taming.getOwner(theWolf, plugin);
PlayerProfile PPo = Users.getProfile(master);
int skillLevel = PPo.getSkillLevel(SkillType.TAMING);
if(master == null || PPo == null)
return;
//Environmentally Aware
if((cause == DamageCause.CONTACT || cause == DamageCause.LAVA || cause == DamageCause.FIRE) && skillLevel >= 100)
{
if(event.getDamage() < theWolf.getHealth())
{
entity.teleport(Taming.getOwner(theWolf, plugin).getLocation());
master.sendMessage(mcLocale.getString("mcEntityListener.WolfComesBack")); //$NON-NLS-1$
entity.setFireTicks(0);
}
}
if(cause == DamageCause.FALL && skillLevel >= 100)
event.setCancelled(true);
//Thick Fur
if(cause == DamageCause.FIRE_TICK)
event.getEntity().setFireTicks(0);
}
if(entity instanceof Player){ if(entity instanceof Player){
Player player = (Player)entity; Player player = (Player)entity;

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

@ -22,6 +22,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import com.gmail.nossr50.Combat; import com.gmail.nossr50.Combat;
@ -35,12 +36,13 @@ public class Taming
{ {
public static void rewardXp(EntityDamageEvent event, mcMMO pluginx, Player master) public static void rewardXp(EntityDamageEvent event, mcMMO pluginx, Player master)
{ {
if(!pluginx.misc.mobSpawnerList.contains(event.getEntity().getEntityId())) Entity entity = event.getEntity();
if(!pluginx.misc.mobSpawnerList.contains(entity.getEntityId()))
{ {
int xp = Combat.getXp(event.getEntity(), event); int xp = Combat.getXp(entity, event);
Users.getProfile(master).addXP(SkillType.TAMING, xp*10, master); Users.getProfile(master).addXP(SkillType.TAMING, xp*10, master);
if(event.getEntity() instanceof Player) if(entity instanceof Player)
{ {
xp = (event.getDamage() * 2); xp = (event.getDamage() * 2);
Users.getProfile(master).addXP(SkillType.TAMING, (int)((xp*10)*1.5), master); Users.getProfile(master).addXP(SkillType.TAMING, (int)((xp*10)*1.5), master);
@ -51,16 +53,19 @@ public class Taming
public static void fastFoodService(PlayerProfile PPo, Wolf theWolf, EntityDamageEvent event) public static void fastFoodService(PlayerProfile PPo, Wolf theWolf, EntityDamageEvent event)
{ {
int health = theWolf.getHealth();
int maxHealth = theWolf.getMaxHealth();
int damage = event.getDamage();
if(PPo.getSkillLevel(SkillType.TAMING) >= 50) if(PPo.getSkillLevel(SkillType.TAMING) >= 50)
{ {
if(theWolf.getHealth() < theWolf.getMaxHealth()) if(health < maxHealth)
{ {
if(Math.random() * 10 > 5) if(Math.random() * 10 > 5)
{ {
if(theWolf.getHealth() + event.getDamage() <= theWolf.getMaxHealth()) if(health + damage <= maxHealth)
theWolf.setHealth(theWolf.getHealth()+event.getDamage()); theWolf.setHealth(health + damage);
else else
theWolf.setHealth(theWolf.getMaxHealth()); theWolf.setHealth(maxHealth);
} }
} }
} }
@ -78,16 +83,17 @@ public class Taming
{ {
if(Math.random() * 1000 <= PPo.getSkillLevel(SkillType.TAMING)) if(Math.random() * 1000 <= PPo.getSkillLevel(SkillType.TAMING))
{ {
Entity entity = event.getEntity();
event.setDamage(event.getDamage() * 2); event.setDamage(event.getDamage() * 2);
if(event.getEntity() instanceof Player) if(entity instanceof Player)
{ {
Player target = (Player)event.getEntity(); Player target = (Player)entity;
target.sendMessage(mcLocale.getString("Combat.StruckByGore")); //$NON-NLS-1$ target.sendMessage(mcLocale.getString("Combat.StruckByGore")); //$NON-NLS-1$
Users.getProfile(target).setBleedTicks(2); Users.getProfile(target).setBleedTicks(2);
} }
else else
pluginx.misc.addToBleedQue((LivingEntity) event.getEntity()); pluginx.misc.addToBleedQue((LivingEntity)entity);
master.sendMessage(mcLocale.getString("Combat.Gore")); //$NON-NLS-1$ master.sendMessage(mcLocale.getString("Combat.Gore")); //$NON-NLS-1$
} }
@ -131,15 +137,36 @@ public class Taming
Player owner = null; Player owner = null;
if (theWolf.getOwner() instanceof Player) if (theWolf.getOwner() instanceof Player)
{
owner = (Player)theWolf.getOwner(); owner = (Player)theWolf.getOwner();
}
if(owner != null) if(owner != null)
{
return owner.getName(); return owner.getName();
}
else else
return "Offline Master"; return "Offline Master";
} }
public static void preventDamage(EntityDamageEvent event, mcMMO plugin)
{
DamageCause cause = event.getCause();
Entity entity = event.getEntity();
Wolf theWolf = (Wolf)entity;
Player master = getOwner(theWolf, plugin);
int skillLevel = Users.getProfile(master).getSkillLevel(SkillType.TAMING);
//Environmentally Aware
if((cause == DamageCause.CONTACT || cause == DamageCause.LAVA || cause == DamageCause.FIRE) && skillLevel >= 100)
{
if(event.getDamage() < theWolf.getHealth())
{
entity.teleport(Taming.getOwner(theWolf, plugin).getLocation());
master.sendMessage(mcLocale.getString("mcEntityListener.WolfComesBack")); //$NON-NLS-1$
entity.setFireTicks(0);
}
}
if(cause == DamageCause.FALL && skillLevel >= 100)
event.setCancelled(true);
//Thick Fur
if(cause == DamageCause.FIRE_TICK)
event.getEntity().setFireTicks(0);
}
} }