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

Fix where myspawn wasn't teleporting players. Fixed more null pointer errors.

Browse Source
This commit is contained in:
nossr50 2011-02-04 21:31:54 -08:00
parent 6feb824940
commit 7f8b3632e4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,9 +25,6 @@ public class mcEntityListener extends EntityListener {
//If defender is player //If defender is player
if(x instanceof Player){ if(x instanceof Player){
Player defender = (Player)x; Player defender = (Player)x;
if(mcUsers.getProfile(defender).inParty() && mcUsers.getProfile(defender).getParty().equals(mcUsers.getProfile(attacker).getParty()))
event.setCancelled(true);
if(mcUsers.getProfile(defender).isDead()) if(mcUsers.getProfile(defender).isDead())
return; return;
if((defender.getHealth() - event.getDamage()) <= 0){ if((defender.getHealth() - event.getDamage()) <= 0){
@ -36,6 +33,9 @@ public class mcEntityListener extends EntityListener {
mcUsers.getProfile(defender).setDead(true); mcUsers.getProfile(defender).setDead(true);
} }
} }
//Moving this below the death message for now, seems to have issues when the defender is not in a party
if((mcUsers.getProfile(defender).inParty() && mcUsers.getProfile(attacker).inParty())&& mcUsers.getProfile(defender).getParty().equals(mcUsers.getProfile(attacker).getParty()))
event.setCancelled(true);
} }
} }
} }
@ -44,10 +44,6 @@ public class mcEntityListener extends EntityListener {
Entity x = event.getEntity(); Entity x = event.getEntity();
if(x instanceof Player){ if(x instanceof Player){
Player player = (Player)x; Player player = (Player)x;
if(mcUsers.getProfile(player).isDead()){
mcUsers.getProfile(player).setDead(false);
return;
}
if((player.getHealth() - event.getDamage()) <= 0){ if((player.getHealth() - event.getDamage()) <= 0){
Location deathLoc = player.getLocation(); Location deathLoc = player.getLocation();
ItemStack[] items = player.getInventory().getContents(); ItemStack[] items = player.getInventory().getContents();
@ -61,6 +57,10 @@ public class mcEntityListener extends EntityListener {
} }
player.setHealth(20); player.setHealth(20);
player.teleportTo(mcUsers.getProfile(player).getMySpawn(player)); player.teleportTo(mcUsers.getProfile(player).getMySpawn(player));
if(mcUsers.getProfile(player).isDead()){
mcUsers.getProfile(player).setDead(false);
return;
}
for(Player derp : plugin.getServer().getOnlinePlayers()){ for(Player derp : plugin.getServer().getOnlinePlayers()){
derp.sendMessage(ChatColor.GRAY+player.getName() + " has died."); derp.sendMessage(ChatColor.GRAY+player.getName() + " has died.");
} }