Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

Return after we cancel an event

Browse Source 
For EntityDamageByEntity and EntityDamage
This commit is contained in:
NuclearW 2012-03-08 13:22:14 -05:00
parent 63bdc16e2f
commit 7a549ce211
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,10 @@ public class mcEntityListener implements Listener
{
if(!defender.getWorld().getPVP())
return;
if(Party.getInstance().inSameParty((Player)defender, (Player)attacker))
if(Party.getInstance().inSameParty((Player)defender, (Player)attacker)) {
event.setCancelled(true);
return;
}
}
//Make sure defender is not invincible
@ -91,8 +93,10 @@ public class mcEntityListener implements Listener
*/
Player player = (Player) entity;
PlayerProfile PP = Users.getProfile(player);
if(PP.getGodMode())
event.setCancelled(true);
if(PP.getGodMode()) {
event.setCancelled(true);
return;
}
if(!m.isInvincible(player, event))
{