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

Fix indent style

Browse Source
This commit is contained in:
Olof Larsson 2014-09-17 14:25:26 +02:00
parent 9ecb4f532a
commit 3ade89cf1f
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/massivecraft/factions/entity/MConf.java
View File

@ -435,7 +435,6 @@ public class MConf extends Entity<MConf>
MConf.get().factionIdNone MConf.get().factionIdNone
); );
// -------------------------------------------- // // -------------------------------------------- //
// INTEGRATION: ECONOMY // INTEGRATION: ECONOMY
// -------------------------------------------- // // -------------------------------------------- //

29
src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java
View File

@ -81,7 +81,8 @@ public class EngineLwc implements Listener
Boolean notAllowedHere = false; Boolean notAllowedHere = false;
// Are they allowed to have LWC protections in this faction land // Are they allowed to have LWC protections in this faction land
if(MConf.get().lwcDisallowIn.contains(factionHere.getId())) { if (MConf.get().lwcDisallowIn.contains(factionHere.getId()))
{
notAllowedHere = true; notAllowedHere = true;
} }
@ -91,17 +92,23 @@ public class EngineLwc implements Listener
factionHere.getId().equals(MConf.get().factionIdSafezone) || factionHere.getId().equals(MConf.get().factionIdSafezone) ||
factionHere.getId().equals(MConf.get().factionIdWarzone); factionHere.getId().equals(MConf.get().factionIdWarzone);
if(!ignore) { if ( ! ignore)
if(!MConf.get().lwcAllowIn.containsKey(relation)) { {
if (!MConf.get().lwcAllowIn.containsKey(relation))
{
notAllowedHere = true; notAllowedHere = true;
} else { }
if(!MConf.get().lwcAllowIn.get(relation)) { else
{
if(!MConf.get().lwcAllowIn.get(relation))
{
notAllowedHere = true; notAllowedHere = true;
} }
} }
} }
if(notAllowedHere) { if (notAllowedHere)
{
event.setCancelled(true); event.setCancelled(true);
mplayer.msg(Txt.parse("<red>You cannot create this LWC protection in this faction.")); mplayer.msg(Txt.parse("<red>You cannot create this LWC protection in this faction."));
} }
@ -124,10 +131,14 @@ public class EngineLwc implements Listener
Boolean passRelationTest = true; Boolean passRelationTest = true;
// If the relationship isn't in the MConf, consider it failed // If the relationship isn't in the MConf, consider it failed
if(!MConf.get().lwcAllowIn.containsKey(rel)) { if ( ! MConf.get().lwcAllowIn.containsKey(rel))
{
passRelationTest = false; passRelationTest = false;
} else { }
if(!MConf.get().lwcAllowIn.get(rel)) { else
{
if ( ! MConf.get().lwcAllowIn.get(rel))
{
passRelationTest = false; passRelationTest = false;
} }
} }