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

All changes up to 0.5.3

Browse Source
This commit is contained in:
nossr50 2011-02-11 20:25:05 -08:00
parent 3e7f0faa34
commit 61b823dcbf
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mcMMO/com/bukkit/nossr50/mcMMO/mcEntityListener.java
View File

@ -37,7 +37,7 @@ public class mcEntityListener extends EntityListener {
if(block != null && block.getTypeId() == 81){ if(block != null && block.getTypeId() == 81){
if(mcUsers.getProfile(player).isDead()) if(mcUsers.getProfile(player).isDead())
return; return;
if(player.getHealth() - event.getDamage() >= 0){ if(player.getHealth() - event.getDamage() <= 0){
mcUsers.getProfile(player).setDead(true); mcUsers.getProfile(player).setDead(true);
for(Player bidoof : plugin.getServer().getOnlinePlayers()){ for(Player bidoof : plugin.getServer().getOnlinePlayers()){
bidoof.sendMessage(ChatColor.GRAY+player.getName()+" has been"+ChatColor.DARK_GREEN+" cactus tickled "+ChatColor.GRAY+"to death."); bidoof.sendMessage(ChatColor.GRAY+player.getName()+" has been"+ChatColor.DARK_GREEN+" cactus tickled "+ChatColor.GRAY+"to death.");
@ -83,7 +83,7 @@ public class mcEntityListener extends EntityListener {
} }
} }
if(mcUsers.getProfile(defender).getSwordsInt() >= 450 && mcUsers.getProfile(defender).getSwordsInt() < 775){ if(mcUsers.getProfile(defender).getSwordsInt() >= 450 && mcUsers.getProfile(defender).getSwordsInt() < 775){
if(Math.random() * 10 > 4){ if(Math.random() * 10 > 5){
event.setCancelled(true); event.setCancelled(true);
defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*"); defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*");
defender.getItemInHand().setDurability((short) (defender.getItemInHand().getDurability() + 1)); defender.getItemInHand().setDurability((short) (defender.getItemInHand().getDurability() + 1));
@ -96,7 +96,7 @@ public class mcEntityListener extends EntityListener {
} }
} }
if(mcUsers.getProfile(defender).getSwordsInt() >= 775){ if(mcUsers.getProfile(defender).getSwordsInt() >= 775){
if(Math.random() * 10 > 6){ if(Math.random() * 10 > 4){
event.setCancelled(true); event.setCancelled(true);
defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*"); defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*");
defender.getItemInHand().setDurability((short) (defender.getItemInHand().getDurability() + 1)); defender.getItemInHand().setDurability((short) (defender.getItemInHand().getDurability() + 1));
@ -142,6 +142,12 @@ public class mcEntityListener extends EntityListener {
} }
} }
} }
if(defender.getHealth() <= 0){
for(ItemStack i : defender.getInventory().getContents()){
if(i != null && i.getTypeId() != 0)
defender.getLocation().getWorld().dropItemNaturally(defender.getLocation(), i);
}
}
} }
if(y instanceof Player){ if(y instanceof Player){
int type = ((Player) y).getItemInHand().getTypeId(); int type = ((Player) y).getItemInHand().getTypeId();
@ -189,7 +195,6 @@ public class mcEntityListener extends EntityListener {
} }
} }
if(x instanceof Monster){ if(x instanceof Monster){
if(type == 0){
Monster defender = (Monster)event.getEntity(); Monster defender = (Monster)event.getEntity();
if(isSwords(attacker.getItemInHand()) && defender.getHealth() > 0){ if(isSwords(attacker.getItemInHand()) && defender.getHealth() > 0){
if(Math.random() * 10 > 9){ if(Math.random() * 10 > 9){
@ -197,6 +202,7 @@ public class mcEntityListener extends EntityListener {
attacker.sendMessage(ChatColor.YELLOW+"Swords skill increased by 1. Total ("+mcUsers.getProfile(attacker).getSwords()+")"); attacker.sendMessage(ChatColor.YELLOW+"Swords skill increased by 1. Total ("+mcUsers.getProfile(attacker).getSwords()+")");
} }
} }
if(type == 0){
if(defender.getHealth() <= 0) if(defender.getHealth() <= 0)
return; return;
if(mcUsers.getProfile(attacker).getUnarmedInt() >= 50 && mcUsers.getProfile(attacker).getUnarmedInt() < 100){ if(mcUsers.getProfile(attacker).getUnarmedInt() >= 50 && mcUsers.getProfile(attacker).getUnarmedInt() < 100){
@ -574,6 +580,8 @@ public class mcEntityListener extends EntityListener {
player.sendMessage("**ROLLED... LIKE A BOSS**"); player.sendMessage("**ROLLED... LIKE A BOSS**");
return; return;
} }
if(player.getHealth() - event.getDamage() <= 0)
return;
if(!mcConfig.getInstance().isBlockWatched(loc.getWorld().getBlockAt(xx, y, z))){ if(!mcConfig.getInstance().isBlockWatched(loc.getWorld().getBlockAt(xx, y, z))){
if(event.getDamage() >= 2 && event.getDamage() < 6){ if(event.getDamage() >= 2 && event.getDamage() < 6){
mcUsers.getProfile(player).skillUpAcrobatics(1); mcUsers.getProfile(player).skillUpAcrobatics(1);

2
mcMMO/plugin.yml
View File

@ -1,3 +1,3 @@
name: mcMMO name: mcMMO
main: com.bukkit.nossr50.mcMMO.mcMMO main: com.bukkit.nossr50.mcMMO.mcMMO
version: 0.5 version: 0.5.3