From 3ade89cf1f954c3c945f677ca051ef6e2f867912 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 17 Sep 2014 14:25:26 +0200 Subject: [PATCH] Fix indent style --- .../massivecraft/factions/entity/MConf.java | 1 - .../factions/integration/lwc/EngineLwc.java | 31 +++++++++++++------ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/entity/MConf.java b/src/main/java/com/massivecraft/factions/entity/MConf.java index 3aa41f9d..81d8ca73 100644 --- a/src/main/java/com/massivecraft/factions/entity/MConf.java +++ b/src/main/java/com/massivecraft/factions/entity/MConf.java @@ -435,7 +435,6 @@ public class MConf extends Entity MConf.get().factionIdNone ); - // -------------------------------------------- // // INTEGRATION: ECONOMY // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java b/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java index 8ccc2124..dabca270 100644 --- a/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java +++ b/src/main/java/com/massivecraft/factions/integration/lwc/EngineLwc.java @@ -81,7 +81,8 @@ public class EngineLwc implements Listener Boolean notAllowedHere = false; // 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; } @@ -91,17 +92,23 @@ public class EngineLwc implements Listener factionHere.getId().equals(MConf.get().factionIdSafezone) || factionHere.getId().equals(MConf.get().factionIdWarzone); - if(!ignore) { - if(!MConf.get().lwcAllowIn.containsKey(relation)) { + if ( ! ignore) + { + if (!MConf.get().lwcAllowIn.containsKey(relation)) + { notAllowedHere = true; - } else { - if(!MConf.get().lwcAllowIn.get(relation)) { + } + else + { + if(!MConf.get().lwcAllowIn.get(relation)) + { notAllowedHere = true; } } } - if(notAllowedHere) { + if (notAllowedHere) + { event.setCancelled(true); mplayer.msg(Txt.parse("You cannot create this LWC protection in this faction.")); } @@ -124,15 +131,19 @@ public class EngineLwc implements Listener Boolean passRelationTest = true; // 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; - } else { - if(!MConf.get().lwcAllowIn.get(rel)) { + } + else + { + if ( ! MConf.get().lwcAllowIn.get(rel)) + { passRelationTest = false; } } - if(!passRelationTest) continue; + if ( ! passRelationTest) continue; protection.remove(); }