EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for options which disable wilderness explosions (TNT, creepers, fireballs) not actually disabling them; player->player damage is now also prevented if attacker is in a safe zone and defender is not (attacking from safety that way was exploity)

Browse Source
This commit is contained in:
Brettflan
2011-06-08 16:22:19 -05:00
parent d0a405ff95
commit 85fd5eb04d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/mcteam/factions/listeners/FactionsEntityListener.java
View File

@@ -94,11 +94,6 @@ public class FactionsEntityListener extends EntityListener {
Faction faction = Board.getFactionAt(new FLocation(event.getLocation())); Faction faction = Board.getFactionAt(new FLocation(event.getLocation()));
// Explosions may happen in the wilderness
if (faction.isNone()) {
return;
}
if (event.getEntity() instanceof Creeper && ( if (event.getEntity() instanceof Creeper && (
(faction.isNone() && Conf.wildernessBlockCreepers) || (faction.isNone() && Conf.wildernessBlockCreepers) ||
(faction.isNormal() && Conf.territoryBlockCreepers) || (faction.isNormal() && Conf.territoryBlockCreepers) ||
@@ -161,6 +156,12 @@ public class FactionsEntityListener extends EntityListener {
return true; return true;
} }
// so we know from above that the defender isn't in a safezone... what about the attacker, sneaky dog that he might be?
if (Board.getFactionAt(new FLocation(attacker)).isSafeZone()) {
attacker.sendMessage("You can't hurt other players while you are in a SafeZone.");
return false;
}
Relation relation = defender.getRelation(attacker); Relation relation = defender.getRelation(attacker);
// Players without faction may be hurt anywhere // Players without faction may be hurt anywhere