Maven Attempt 1

.gitignore

@@ -1,20 +1,31 @@
-# Eclipse stuff
+# Eclipse
 /.classpath
 /.project
 /.settings
+/*.jardesc
+
+# IntelliJ
+*.iml
+*.ipr
+*.iws
+.idea/
 
 # NetBeans
 /nbproject
-/build.xml
 
 # vim
 .*.sw[a-p]
 
+# Maven
+/build.xml
+/target
+/dependency-reduced-pom.xml
+
 # various other potential build files
 /build
 /bin
 /dist
-/*.jardesc
+/manifest.mf
 
 # Mac filesystem dust
 .DS_Store

pom.xml

@@ -0,0 +1,82 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<name>Factions</name>
+	<url>http://www.massivecraft.com/factions</url>
+	
+	<groupId>com.massivecraft</groupId>
+	<artifactId>Factions</artifactId>
+	<version>2.6.1</version>
+	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	
+	<build>
+		<defaultGoal>clean install</defaultGoal>
+		<finalName>Factions</finalName>
+		<sourceDirectory>${basedir}/src/main/java/</sourceDirectory>
+		<resources>
+			<resource>
+				<targetPath>.</targetPath>
+				<directory>${basedir}/src/main/resources/</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>*.yml</include>
+					<include>*.md</include>
+					<include>*.txt</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+	<dependencies>
+		<dependency>
+			<groupId>com.massivecraft</groupId>
+			<artifactId>MassiveCore</artifactId>
+			<version>LATEST</version>
+		</dependency>
+		<dependency>
+			<groupId>us.dynmap</groupId>
+			<artifactId>dynmap-api</artifactId>
+			<version>2.0.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>us.dynmap</groupId>
+			<artifactId>DynmapCore</artifactId>
+			<version>2.0.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.dthielke</groupId>
+			<artifactId>HeroChat</artifactId>
+			<version>5.6.7</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/lib/HeroChat-5.6.7.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>com.griefcraft</groupId>
+			<artifactId>LWC</artifactId>
+			<version>4.4.0</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/lib/LWC-4.4.0.jar</systemPath>
+		</dependency>
+	</dependencies>
+	
+	<repositories>
+		<repository>
+			<id>dynmap-repo</id>
+			<url>http://repo.mikeprimm.com/</url>
+		</repository>
+	</repositories>
+	
+</project>

src/main/java/com/massivecraft/factions/Factions.java

@@ -47,8 +47,8 @@ import com.massivecraft.massivecore.AspectColl;
 import com.massivecraft.massivecore.MassivePlugin;
 import com.massivecraft.massivecore.Multiverse;
 import com.massivecraft.massivecore.util.MUtil;
-import com.massivecraft.massivecore.xlib.gson.Gson;
+import com.google.gson.Gson;
-import com.massivecraft.massivecore.xlib.gson.GsonBuilder;
+import com.google.gson.GsonBuilder;
 
 
 public class Factions extends MassivePlugin

src/main/java/com/massivecraft/factions/adapter/BoardAdapter.java

@@ -4,12 +4,12 @@ import java.lang.reflect.Type;
 import java.util.Map;
 
 import com.massivecraft.massivecore.ps.PS;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
+import com.google.gson.JsonDeserializer;
-import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.google.gson.JsonElement;
-import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.google.gson.JsonParseException;
-import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
+import com.google.gson.JsonSerializer;
 import com.massivecraft.factions.TerritoryAccess;
 import com.massivecraft.factions.entity.Board;
 

src/main/java/com/massivecraft/factions/adapter/BoardMapAdapter.java

@@ -6,13 +6,13 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentSkipListMap;
 
 import com.massivecraft.massivecore.ps.PS;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
+import com.google.gson.JsonDeserializer;
-import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.google.gson.JsonElement;
-import com.massivecraft.massivecore.xlib.gson.JsonObject;
+import com.google.gson.JsonObject;
-import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.google.gson.JsonParseException;
-import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
+import com.google.gson.JsonSerializer;
 import com.massivecraft.factions.TerritoryAccess;
 
 public class BoardMapAdapter implements JsonDeserializer<Map<PS, TerritoryAccess>>, JsonSerializer<Map<PS, TerritoryAccess>>

src/main/java/com/massivecraft/factions/adapter/FFlagAdapter.java

@@ -3,10 +3,10 @@ package com.massivecraft.factions.adapter;
 import java.lang.reflect.Type;
 
 import com.massivecraft.factions.FFlag;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
+import com.google.gson.JsonDeserializer;
-import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.google.gson.JsonElement;
-import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.google.gson.JsonParseException;
 
 public class FFlagAdapter implements JsonDeserializer<FFlag>
 {

src/main/java/com/massivecraft/factions/adapter/FPermAdapter.java

@@ -2,10 +2,10 @@ package com.massivecraft.factions.adapter;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
+import com.google.gson.JsonDeserializer;
-import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.google.gson.JsonElement;
-import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.google.gson.JsonParseException;
 import com.massivecraft.factions.FPerm;
 
 public class FPermAdapter implements JsonDeserializer<FPerm>

src/main/java/com/massivecraft/factions/adapter/FactionPreprocessAdapter.java

@@ -2,11 +2,11 @@ package com.massivecraft.factions.adapter;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
+import com.google.gson.JsonDeserializer;
-import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.google.gson.JsonElement;
-import com.massivecraft.massivecore.xlib.gson.JsonObject;
+import com.google.gson.JsonObject;
-import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.google.gson.JsonParseException;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.entity.Faction;
 

src/main/java/com/massivecraft/factions/adapter/RelAdapter.java

@@ -2,10 +2,10 @@ package com.massivecraft.factions.adapter;
 
 import java.lang.reflect.Type;
 
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
+import com.google.gson.JsonDeserializer;
-import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.google.gson.JsonElement;
-import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.google.gson.JsonParseException;
 import com.massivecraft.factions.Rel;
 
 public class RelAdapter implements JsonDeserializer<Rel>

src/main/java/com/massivecraft/factions/adapter/TerritoryAccessAdapter.java

@@ -3,15 +3,15 @@ package com.massivecraft.factions.adapter;
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonDeserializer;
+import com.google.gson.JsonDeserializer;
-import com.massivecraft.massivecore.xlib.gson.JsonElement;
+import com.google.gson.JsonElement;
-import com.massivecraft.massivecore.xlib.gson.JsonObject;
+import com.google.gson.JsonObject;
-import com.massivecraft.massivecore.xlib.gson.JsonParseException;
+import com.google.gson.JsonParseException;
-import com.massivecraft.massivecore.xlib.gson.JsonPrimitive;
+import com.google.gson.JsonPrimitive;
-import com.massivecraft.massivecore.xlib.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializationContext;
-import com.massivecraft.massivecore.xlib.gson.JsonSerializer;
+import com.google.gson.JsonSerializer;
-import com.massivecraft.massivecore.xlib.gson.reflect.TypeToken;
+import com.google.gson.reflect.TypeToken;
 import com.massivecraft.factions.TerritoryAccess;
 
 public class TerritoryAccessAdapter implements JsonDeserializer<TerritoryAccess>, JsonSerializer<TerritoryAccess>

src/main/java/com/massivecraft/factions/cmd/FCommand.java

@@ -37,6 +37,15 @@ public abstract class FCommand extends MassiveCommand
 		this.usenderFaction = this.usender.getFaction();
 	}
 	
+	
+	@Override
+	public void unsetSenderVars()
+	{
+		this.msender = null;
+		this.usender = null;
+		this.usenderFaction = null;
+	}
+	
 	// -------------------------------------------- //
 	// COMMONLY USED LOGIC
 	// -------------------------------------------- //