Skip to content

Updated listener to enable PVP between friends in FRIENDLYFIRE faction areas #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
admgre wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated listener to enable PVP between friends in FRIENDLYFIRE faction areas #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src_factions/com/nisovin/magicspells/factions/MagicSpellsFactions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,19 @@ public void onSpellTarget(SpellTargetEvent event) {
UPlayer target = UPlayer.get(event.getTarget());

Rel rel = caster.getRelationTo(target);
if (rel.isFriend() && !beneficial) {
event.setCancelled(true);
} else if (!rel.isFriend() && beneficial) {

Faction caster_faction = BoardColls.get().getFactionAt(PS.valueOf(event.getCaster().getLocation()));
if (caster_faction != null && !caster_faction.getFlag(FFlag.PVP)) {
event.setCancelled(true);
}

Faction faction = BoardColls.get().getFactionAt(PS.valueOf(event.getCaster().getLocation()));
if (faction != null && !faction.getFlag(FFlag.PVP)) {
Faction target_faction = BoardColls.get().getFactionAt(PS.valueOf(event.getTarget().getLocation()));
if (target_faction != null && !target_faction.getFlag(FFlag.PVP)) {
event.setCancelled(true);
}
faction = BoardColls.get().getFactionAt(PS.valueOf(event.getTarget().getLocation()));
if (faction != null && !faction.getFlag(FFlag.PVP)) {

if (rel.isFriend() && !beneficial && !((caster_faction != null && caster_faction.getFlag(FFlag.FRIENDLYFIRE)) && (target_faction != null && target_faction.getFlag(FFlag.FRIENDLYFIRE)))) {
event.setCancelled(true);
} else if (!rel.isFriend() && beneficial) {
event.setCancelled(true);
}
}
Expand Down