From 10a19d00c41dc37bbc19bd31750539e0109fbbcb Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Fri, 19 Dec 2014 11:53:59 +0100 Subject: [PATCH] Move WorldExceptionSet from Faction to MassiveCore. Closes MassiveCraft/MassiveCore#197. --- .../factions/WorldExceptionSet.java | 33 ------------------- .../massivecraft/factions/entity/MConf.java | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 src/main/java/com/massivecraft/factions/WorldExceptionSet.java diff --git a/src/main/java/com/massivecraft/factions/WorldExceptionSet.java b/src/main/java/com/massivecraft/factions/WorldExceptionSet.java deleted file mode 100644 index 9c1568ed..00000000 --- a/src/main/java/com/massivecraft/factions/WorldExceptionSet.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.massivecraft.factions; - -import org.bukkit.World; - -import com.massivecraft.massivecore.CaseInsensitiveComparator; -import com.massivecraft.massivecore.collections.MassiveTreeSet; - -public class WorldExceptionSet -{ - // -------------------------------------------- // - // FIELDS - // -------------------------------------------- // - - public boolean standard = true; - - public MassiveTreeSet exceptions = new MassiveTreeSet(CaseInsensitiveComparator.get()); - - // -------------------------------------------- // - // CONTAINS - // -------------------------------------------- // - - public boolean contains(String world) - { - if (this.exceptions.contains(world)) return !this.standard; - return this.standard; - } - - public boolean contains(World world) - { - return this.contains(world.getName()); - } - -} diff --git a/src/main/java/com/massivecraft/factions/entity/MConf.java b/src/main/java/com/massivecraft/factions/entity/MConf.java index df827a89..4ff166f3 100644 --- a/src/main/java/com/massivecraft/factions/entity/MConf.java +++ b/src/main/java/com/massivecraft/factions/entity/MConf.java @@ -14,10 +14,10 @@ import org.bukkit.event.EventPriority; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Rel; -import com.massivecraft.factions.WorldExceptionSet; import com.massivecraft.factions.engine.EngineChat; import com.massivecraft.factions.event.EventFactionsChunkChangeType; import com.massivecraft.massivecore.collections.BackstringEnumSet; +import com.massivecraft.massivecore.collections.WorldExceptionSet; import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.TimeUnit;