Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-24 03:05:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix for "territoryEnemyProtectMaterials" and "territoryAllyProtectMaterials" not working correctly, and wrong protection message being sent to neutral players. Re-jiggered the related code a bit which handles such things based on enemy/ally/member/neutral status.

Browse Source
This commit is contained in:
Brettflan 2011-09-22 16:12:35 -05:00
parent 8e074fb5ac
commit 60abb61cb9
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,8 +206,7 @@ public class FactionsBlockListener extends BlockListener {
}
}
// Also cancel and/or cause pain if player doesn't have ownership rights for this claim
if (ownershipFail && !Factions.hasPermOwnershipBypass(player)
) {
else if (rel.isMember() && ownershipFail && !Factions.hasPermOwnershipBypass(player)) {
if (Conf.ownedAreaPainBuild){
player.damage(Conf.actionDeniedPainAmount);
if (!Conf.ownedAreaDenyBuild) {

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

@ -384,7 +384,7 @@ public class FactionsEntityListener extends EntityListener {
return false;
}
// Also cancel if player doesn't have ownership rights for this claim
else if (ownershipFail && (!rel.isMember() || !Factions.hasPermOwnershipBypass(player))) {
else if (rel.isMember() && ownershipFail && !Factions.hasPermOwnershipBypass(player)) {
me.sendMessage("You can't "+action+" paintings in this territory, it is owned by: "+otherFaction.getOwnerListString(loc));
return false;
}

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

@ -332,7 +332,7 @@ public class FactionsPlayerListener extends PlayerListener{
return false;
}
// Also cancel if player doesn't have ownership rights for this claim
else if (ownershipFail && (!rel.isMember() || !Factions.hasPermOwnershipBypass(player))) {
else if (rel.isMember() && ownershipFail && !Factions.hasPermOwnershipBypass(player)) {
me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in this territory, it is owned by: "+myFaction.getOwnerListString(loc));
return false;
}
@ -372,12 +372,12 @@ public class FactionsPlayerListener extends PlayerListener{
boolean ownershipFail = Conf.ownedAreasEnabled && Conf.ownedAreaProtectMaterials && !otherFaction.playerHasOwnershipRights(me, loc);
// You may use any block unless it is another faction's territory...
if ((rel.isEnemy() && Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && Conf.territoryAllyProtectMaterials)) {
if (rel.isNeutral() || (rel.isEnemy() && Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && Conf.territoryAllyProtectMaterials)) {
me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in the territory of "+otherFaction.getTag(myFaction));
return false;
}
// Also cancel if player doesn't have ownership rights for this claim
else if (ownershipFail && (!rel.isMember() || !Factions.hasPermOwnershipBypass(player))) {
else if (rel.isMember() && ownershipFail && !Factions.hasPermOwnershipBypass(player)) {
me.sendMessage("You can't use "+TextUtil.getMaterialName(material)+" in this territory, it is owned by: "+myFaction.getOwnerListString(loc));
return false;
}