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

Fix for allies bypassing ownership if Ally options allowed them to build/interact/use in allied territory

Browse Source 
Also consolidated some Conf lookups into new functions for Relations, to simplify and de-uglify the code a bit
This commit is contained in:
Brettflan 2011-09-06 16:35:43 -05:00
parent 55c9067e34
commit c89db2c4d6
4 changed files with 104 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/massivecraft/factions/listeners/FactionsBlockListener.java
View File

@ -182,20 +182,22 @@ public class FactionsBlockListener extends BlockListener {
Faction myFaction = me.getFaction(); Faction myFaction = me.getFaction();
Relation rel = myFaction.getRelation(otherFaction); Relation rel = myFaction.getRelation(otherFaction);
boolean ownershipFail = Conf.ownedAreasEnabled && (Conf.ownedAreaDenyBuild || Conf.ownedAreaPainBuild) && !otherFaction.playerHasOwnershipRights(me, loc);
// Cancel if we are not in our own territory // Cancel and/or cause pain (depending on configuration) if we are not in our own territory
if (myFaction != otherFaction) { if (!rel.isMember()) {
boolean online = otherFaction.hasPlayersOnline(); boolean online = otherFaction.hasPlayersOnline();
boolean pain = (online && (rel.isEnemy() ? Conf.territoryEnemyPainBuild : (rel.isAlly() ? Conf.territoryAllyPainBuild : Conf.territoryPainBuild))) boolean pain = rel.confPainBuild(online);
|| (!online && (rel.isEnemy() ? Conf.territoryEnemyPainBuildWhenOffline : (rel.isAlly() ? Conf.territoryAllyPainBuildWhenOffline : Conf.territoryPainBuildWhenOffline))); boolean deny = rel.confDenyBuild(online);
boolean deny = (online && (rel.isEnemy() ? Conf.territoryEnemyDenyBuild : (rel.isAlly() ? Conf.territoryAllyDenyBuild : Conf.territoryDenyBuild)))
|| (!online && (rel.isEnemy() ? Conf.territoryEnemyDenyBuildWhenOffline : (rel.isAlly() ? Conf.territoryAllyDenyBuildWhenOffline : Conf.territoryDenyBuildWhenOffline)));
//added by Bladedpenguin@gmail.com
//hurt the player for building/destroying? //hurt the player for building/destroying?
if (pain) { if (pain) {
player.damage(Conf.actionDeniedPainAmount); player.damage(Conf.actionDeniedPainAmount);
if (!deny) { if (!deny) {
me.sendMessage("You are hurt for "+action+" in the territory of "+otherFaction.getTag(myFaction)); me.sendMessage("You are hurt for "+action+" in the territory of "+otherFaction.getTag(myFaction));
if (!Conf.ownedAreaDenyBuild) {
return true;
}
} }
} }
if (deny) { if (deny) {
@ -203,12 +205,8 @@ public class FactionsBlockListener extends BlockListener {
return false; return false;
} }
} }
// Also cancel if player doesn't have ownership rights for this claim // Also cancel and/or cause pain if player doesn't have ownership rights for this claim
else if ( if (ownershipFail && !Factions.hasPermOwnershipBypass(player)
Conf.ownedAreasEnabled
&& (Conf.ownedAreaDenyBuild || Conf.ownedAreaPainBuild)
&& !myFaction.playerHasOwnershipRights(me, loc)
&& !Factions.hasPermOwnershipBypass(player)
) { ) {
if (Conf.ownedAreaPainBuild){ if (Conf.ownedAreaPainBuild){
player.damage(Conf.actionDeniedPainAmount); player.damage(Conf.actionDeniedPainAmount);

24
src/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -372,26 +372,16 @@ public class FactionsEntityListener extends EntityListener {
Faction myFaction = me.getFaction(); Faction myFaction = me.getFaction();
Relation rel = myFaction.getRelation(otherFaction); Relation rel = myFaction.getRelation(otherFaction);
boolean ownershipFail = Conf.ownedAreasEnabled && Conf.ownedAreaDenyBuild && !otherFaction.playerHasOwnershipRights(me, loc);
// Cancel if we are not in our own territory // Cancel if we are not in our own territory and building should be denied
if (myFaction != otherFaction) { if (!rel.isMember() && rel.confDenyBuild(otherFaction.hasPlayersOnline())) {
boolean online = otherFaction.hasPlayersOnline(); me.sendMessage("You can't "+action+" paintings in the territory of "+otherFaction.getTag(myFaction));
if ( return false;
(online && (rel.isEnemy() ? Conf.territoryEnemyDenyBuild : (rel.isAlly() ? Conf.territoryAllyDenyBuild : Conf.territoryDenyBuild)))
|| (!online && (rel.isEnemy() ? Conf.territoryEnemyDenyBuildWhenOffline : (rel.isAlly() ? Conf.territoryAllyDenyBuildWhenOffline : Conf.territoryDenyBuildWhenOffline)))
) {
me.sendMessage("You can't "+action+" paintings in the territory of "+otherFaction.getTag(myFaction));
return false;
}
} }
// Also cancel if player doesn't have ownership rights for this claim // Also cancel if player doesn't have ownership rights for this claim
else if ( else if (ownershipFail && (!rel.isMember() || !Factions.hasPermOwnershipBypass(player))) {
Conf.ownedAreasEnabled me.sendMessage("You can't "+action+" paintings in this territory, it is owned by: "+otherFaction.getOwnerListString(loc));
&& Conf.ownedAreaDenyBuild
&& !myFaction.playerHasOwnershipRights(me, loc)
&& !Factions.hasPermOwnershipBypass(player)
) {
me.sendMessage("You can't "+action+" paintings in this territory, it is owned by: "+myFaction.getOwnerListString(loc));
return false; return false;
} }

31
src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@ -322,21 +322,15 @@ public class FactionsPlayerListener extends PlayerListener{
Faction myFaction = me.getFaction(); Faction myFaction = me.getFaction();
Relation rel = myFaction.getRelation(otherFaction); Relation rel = myFaction.getRelation(otherFaction);
boolean ownershipFail = Conf.ownedAreasEnabled && Conf.ownedAreaDenyUseage && !otherFaction.playerHasOwnershipRights(me, loc);
// Cancel if we are not in our own territory // Cancel if we are not in our own territory
if (myFaction != otherFaction) { if (!rel.isMember() && rel.confDenyUseage()) {
if (rel.isEnemy() ? Conf.territoryEnemyDenyUseage : (rel.isAlly() ? Conf.territoryAllyDenyUseage : Conf.territoryDenyUseage)) { me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in the territory of "+otherFaction.getTag(myFaction));
me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in the territory of "+otherFaction.getTag(myFaction)); return false;
return false;
}
} }
// Also cancel if player doesn't have ownership rights for this claim // Also cancel if player doesn't have ownership rights for this claim
else if ( else if (ownershipFail && (!rel.isMember() || !Factions.hasPermOwnershipBypass(player))) {
Conf.ownedAreasEnabled
&& Conf.ownedAreaDenyUseage
&& !myFaction.playerHasOwnershipRights(me, loc)
&& !Factions.hasPermOwnershipBypass(player)
) {
me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in this territory, it is owned by: "+myFaction.getOwnerListString(loc)); me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in this territory, it is owned by: "+myFaction.getOwnerListString(loc));
return false; return false;
} }
@ -368,24 +362,15 @@ public class FactionsPlayerListener extends PlayerListener{
FPlayer me = FPlayer.get(player); FPlayer me = FPlayer.get(player);
Faction myFaction = me.getFaction(); Faction myFaction = me.getFaction();
Relation rel = myFaction.getRelation(otherFaction); Relation rel = myFaction.getRelation(otherFaction);
boolean ownershipFail = Conf.ownedAreasEnabled && Conf.ownedAreaProtectMaterials && !otherFaction.playerHasOwnershipRights(me, loc);
if ((rel.isEnemy() && !Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && !Conf.territoryAllyProtectMaterials)) {
return true;
}
// You may use any block unless it is another faction's territory... // You may use any block unless it is another faction's territory...
if (otherFaction.isNormal() && myFaction != otherFaction) { if ((rel.isEnemy() && Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && Conf.territoryAllyProtectMaterials)) {
me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in the territory of "+otherFaction.getTag(myFaction)); me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in the territory of "+otherFaction.getTag(myFaction));
return false; return false;
} }
// Also cancel if player doesn't have ownership rights for this claim // Also cancel if player doesn't have ownership rights for this claim
else if ( else if (ownershipFail && (!rel.isMember() || !Factions.hasPermOwnershipBypass(player))) {
myFaction == otherFaction
&& Conf.ownedAreasEnabled
&& Conf.ownedAreaProtectMaterials
&& !myFaction.playerHasOwnershipRights(me, loc)
&& !Factions.hasPermOwnershipBypass(player)
) {
me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in this territory, it is owned by: "+myFaction.getOwnerListString(loc)); me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in this territory, it is owned by: "+myFaction.getOwnerListString(loc));
return false; return false;
} }

79
src/com/massivecraft/factions/struct/Relation.java
View File

@ -25,19 +25,19 @@ public enum Relation {
} }
public boolean isMember() { public boolean isMember() {
return this == Relation.MEMBER; return this.value == MEMBER.value;
} }
public boolean isAlly() { public boolean isAlly() {
return this == Relation.ALLY; return this.value == ALLY.value;
} }
public boolean isNeutral() { public boolean isNeutral() {
return this == Relation.NEUTRAL; return this.value == NEUTRAL.value;
} }
public boolean isEnemy() { public boolean isEnemy() {
return this == Relation.ENEMY; return this.value == ENEMY.value;
} }
public boolean isAtLeast(Relation relation) { public boolean isAtLeast(Relation relation) {
@ -49,14 +49,79 @@ public enum Relation {
} }
public ChatColor getColor() { public ChatColor getColor() {
if (this == Relation.MEMBER) { if (this.value == MEMBER.value) {
return Conf.colorMember; return Conf.colorMember;
} else if (this == Relation.ALLY) { } else if (this.value == ALLY.value) {
return Conf.colorAlly; return Conf.colorAlly;
} else if (this == Relation.NEUTRAL) { } else if (this.value == NEUTRAL.value) {
return Conf.colorNeutral; return Conf.colorNeutral;
} else { } else {
return Conf.colorEnemy; return Conf.colorEnemy;
} }
} }
// return appropriate Conf setting for DenyBuild based on this relation and their online status
public boolean confDenyBuild(boolean online) {
if (online) {
if (isEnemy()) {
return Conf.territoryEnemyDenyBuild;
}
else if (isAlly()) {
return Conf.territoryAllyDenyBuild;
}
else {
return Conf.territoryDenyBuild;
}
}
else {
if (isEnemy()) {
return Conf.territoryEnemyDenyBuildWhenOffline;
}
else if (isAlly()) {
return Conf.territoryAllyDenyBuildWhenOffline;
}
else {
return Conf.territoryDenyBuildWhenOffline;
}
}
}
// return appropriate Conf setting for PainBuild based on this relation and their online status
public boolean confPainBuild(boolean online) {
if (online) {
if (isEnemy()) {
return Conf.territoryEnemyPainBuild;
}
else if (isAlly()) {
return Conf.territoryAllyPainBuild;
}
else {
return Conf.territoryPainBuild;
}
}
else {
if (isEnemy()) {
return Conf.territoryEnemyPainBuildWhenOffline;
}
else if (isAlly()) {
return Conf.territoryAllyPainBuildWhenOffline;
}
else {
return Conf.territoryPainBuildWhenOffline;
}
}
}
// return appropriate Conf setting for DenyUseage based on this relation
public boolean confDenyUseage() {
if (isEnemy()) {
return Conf.territoryEnemyDenyUseage;
}
else if (isAlly()) {
return Conf.territoryAllyDenyUseage;
}
else {
return Conf.territoryDenyUseage;
}
}
} }