Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-27 20:59:16 +01:00
Code Issues Projects Releases Wiki Activity

Prevent players in peaceful factions from damaging with harmful potions. Fixes issue #50.

Browse Source
This commit is contained in:
Ihaveaporpoise 2014-09-30 17:20:06 -05:00 committed by drtshock
parent bf6a3c2a4b
commit eceb10c185
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -205,6 +205,15 @@ public class FactionsEntityListener implements Listener {
return; return;
} }
if(thrower instanceof Player){
Player player = (Player) thrower;
FPlayer fPlayer = FPlayers.i.get(player);
if(badjuju && fPlayer.getFaction().isPeaceful()){
event.setCancelled(true);
return;
}
}
// scan through affected entities to make sure they're all valid targets // scan through affected entities to make sure they're all valid targets
Iterator<LivingEntity> iter = event.getAffectedEntities().iterator(); Iterator<LivingEntity> iter = event.getAffectedEntities().iterator();
while (iter.hasNext()) { while (iter.hasNext()) {