SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Anotha one

Browse Source
This commit is contained in:
Driftay 2020-04-06 15:34:26 -04:00
parent 8efe68111b
commit cb2afb5a4f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,7 +344,7 @@ public class FactionsEntityListener implements Listener {
FPlayer defender = FPlayers.getInstance().getByPlayer((Player) damagee); FPlayer defender = FPlayers.getInstance().getByPlayer((Player) damagee);
if(damager instanceof Player) { if (damager instanceof Player) {
FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager); FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager);
if (defender == null || defender.getPlayer() == null) return true; if (defender == null || defender.getPlayer() == null) return true;
if (attacker.getFaction() == defender.getFaction()) { if (attacker.getFaction() == defender.getFaction()) {
@ -377,6 +377,7 @@ public class FactionsEntityListener implements Listener {
if (defLocFaction.noPvPInTerritory()) { if (defLocFaction.noPvPInTerritory()) {
if (damager instanceof Player) { if (damager instanceof Player) {
if (notify) { if (notify) {
FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager);
attacker.msg(TL.PLAYER_CANTHURT, (defLocFaction.isSafeZone() ? TL.REGION_SAFEZONE.toString() : TL.REGION_PEACEFUL.toString())); attacker.msg(TL.PLAYER_CANTHURT, (defLocFaction.isSafeZone() ? TL.REGION_SAFEZONE.toString() : TL.REGION_PEACEFUL.toString()));
} }
return false; return false;
@ -386,7 +387,7 @@ public class FactionsEntityListener implements Listener {
if (!(damager instanceof Player)) return true; if (!(damager instanceof Player)) return true;
attacker = FPlayers.getInstance().getByPlayer((Player) damager); FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager);
if (attacker == null || attacker.getPlayer() == null) return true; if (attacker == null || attacker.getPlayer() == null) return true;