Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-27 20:59:16 +01:00
Code Issues Projects Releases Wiki Activity

Added fence gates to default "territoryProtectedMaterials" list.

Browse Source 
Existing users should run these commands to add it to an existing config, if desired:
/f config territoryProtectedMaterials FENCE_GATE
/f config territoryProtectedMaterialsWhenOffline FENCE_GATE

Also changed first letter of "canLeaveWithNegativePower" setting to lowercase, to fit with Java standards. If you had previously changed this setting to false, you'll need to do so again.
This commit is contained in:
Brettflan 2011-10-15 12:46:09 -05:00
parent 04074bc2b4
commit 3981ca4dde
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/Conf.java
View File

@ -43,7 +43,7 @@ public class Conf
public static boolean showEnemyFactionsOnMap = true; public static boolean showEnemyFactionsOnMap = true;
// Disallow joining/leaving/kicking while power is negative // Disallow joining/leaving/kicking while power is negative
public static boolean CanLeaveWithNegativePower = true; public static boolean canLeaveWithNegativePower = true;
// Configuration for faction-only chat // Configuration for faction-only chat
public static boolean factionOnlyChat = true; public static boolean factionOnlyChat = true;
@ -250,6 +250,7 @@ public class Conf
territoryProtectedMaterials.add(Material.WOODEN_DOOR); territoryProtectedMaterials.add(Material.WOODEN_DOOR);
territoryProtectedMaterials.add(Material.TRAP_DOOR); territoryProtectedMaterials.add(Material.TRAP_DOOR);
territoryProtectedMaterials.add(Material.FENCE_GATE);
territoryProtectedMaterials.add(Material.DISPENSER); territoryProtectedMaterials.add(Material.DISPENSER);
territoryProtectedMaterials.add(Material.CHEST); territoryProtectedMaterials.add(Material.CHEST);
territoryProtectedMaterials.add(Material.FURNACE); territoryProtectedMaterials.add(Material.FURNACE);
@ -264,6 +265,7 @@ public class Conf
territoryProtectedMaterialsWhenOffline.add(Material.WOODEN_DOOR); territoryProtectedMaterialsWhenOffline.add(Material.WOODEN_DOOR);
territoryProtectedMaterialsWhenOffline.add(Material.TRAP_DOOR); territoryProtectedMaterialsWhenOffline.add(Material.TRAP_DOOR);
territoryProtectedMaterialsWhenOffline.add(Material.FENCE_GATE);
territoryProtectedMaterialsWhenOffline.add(Material.DISPENSER); territoryProtectedMaterialsWhenOffline.add(Material.DISPENSER);
territoryProtectedMaterialsWhenOffline.add(Material.CHEST); territoryProtectedMaterialsWhenOffline.add(Material.CHEST);
territoryProtectedMaterialsWhenOffline.add(Material.FURNACE); territoryProtectedMaterialsWhenOffline.add(Material.FURNACE);

2
src/com/massivecraft/factions/FPlayer.java
View File

@ -577,7 +577,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
return; return;
} }
if (!Conf.CanLeaveWithNegativePower && this.getPower() < 0) if (!Conf.canLeaveWithNegativePower && this.getPower() < 0)
{ {
msg("<b>You cannot leave until your power is positive."); msg("<b>You cannot leave until your power is positive.");
return; return;

2
src/com/massivecraft/factions/cmd/CmdJoin.java
View File

@ -47,7 +47,7 @@ public class CmdJoin extends FCommand
return; return;
} }
if (!Conf.CanLeaveWithNegativePower && fme.getPower() < 0) if (!Conf.canLeaveWithNegativePower && fme.getPower() < 0)
{ {
msg("<b>You cannot join a faction until your power is positive."); msg("<b>You cannot join a faction until your power is positive.");
return; return;

2
src/com/massivecraft/factions/cmd/CmdKick.java
View File

@ -57,7 +57,7 @@ public class CmdKick extends FCommand
return; return;
} }
if ( ! Conf.CanLeaveWithNegativePower && you.getPower() < 0) if ( ! Conf.canLeaveWithNegativePower && you.getPower() < 0)
{ {
msg("<b>You cannot kick that member until their power is positive."); msg("<b>You cannot kick that member until their power is positive.");
return; return;