Merge pull request #244 from AuthMe-Team/master

1.7 conflicts issues

pom.xml

@@ -84,27 +84,19 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.4.1</version>
+				<version>2.4.2</version>
 				<configuration>
 					<createDependencyReducedPom>false</createDependencyReducedPom>
 					<minimizeJar>true</minimizeJar>
-					<!-- <artifactSet>
-						<includes>
-							<include>com.zaxxer:HikariCP</include>
-							<include>org.slf4j:slf4j-jdk14</include>
-							<include>org.slf4j:slf4j-api</include>
-							<include>com.maxmind.geoip:geoip-api</include>
-							<include>com.sun.mail:javax.mail</include>
-							<include>com.comphenix.attribute:AttributeStorage</include>
-							<include>org.mcstats.bukkit:metrics</include>
-							<include>com.google.code.gson:gson</include>
-						</includes>
-					</artifactSet> -->
 					<relocations>
 						<relocation>
 							<pattern>org.mcstats</pattern>
 							<shadedPattern>fr.xephi.authme</shadedPattern>
 						</relocation>
+						<relocation>
+							<pattern>com.google.gson</pattern>
+							<shadedPattern>fr.xephi.authme.libs.gson</shadedPattern>
+						</relocation>
 					</relocations>
 				</configuration>
 				<executions>
@@ -139,12 +131,6 @@
 			<url>http://repo.minelink.net/content/repositories/public</url>
 		</repository>
 
-		<!-- Attribute Repo -->
-		<repository>
-			<id>comphenix-repo</id>
-			<url>http://repo.comphenix.net/content/repositories/public</url>
-		</repository>
-
 		<!-- ProtocolLib Repo -->
 		<repository>
 			<id>dmulloy2-repo</id>
@@ -175,18 +161,17 @@
 			<url>http://ci.xephi.fr/plugin/repository/everything/</url>
 		</repository>
 
-		<!-- Metrics Snapshots Repo (Too instable! 60% UPTIME)
+		<!-- Metrics Snapshots Repo (Always offline! 60% UPTIME)
 		<repository>
 			<id>mcstats-snapshots</id>
 			<url>http://repo.mcstats.org/content/repositories/snapshots/</url>
-		</repository> -->
+		</repository>
+		-->
 
 	</repositories>
 
 	<dependencies>
 
-		<!-- Maven Dependencies -->
-
 		<!-- Database Connection Pool -->
 		<dependency>
 			<groupId>com.zaxxer</groupId>
@@ -209,7 +194,7 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- Log4J Logger (for the filter) -->
+		<!-- Log4J Logger (required by the console filter) -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
@@ -219,14 +204,7 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- Java Email API and Implementation
+		<!-- Java Email Implementation -->
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>javax.mail-api</artifactId>
-			<version>1.5.4</version>
-			<scope>compile</scope>
-			<optional>true</optional>
-		</dependency> -->
 		<dependency>
 			<groupId>com.sun.mail</groupId>
 			<artifactId>javax.mail</artifactId>
@@ -241,7 +219,7 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- GSON required for 1.7.X compatibility -->
+		<!-- GSON (required to provide 1.7.10 and below compatibility) -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
@@ -250,7 +228,6 @@
 			<optional>true</optional>
 		</dependency>
 
-
 		<!-- Maxmind GeoIp API -->
 		<dependency>
 			<groupId>com.maxmind.geoip</groupId>
@@ -302,26 +279,7 @@
 			</exclusions>
 		</dependency>
 
-		<!-- Attribute -->
+		<!-- ProtocolLib, http://dev.bukkit.org/bukkit-plugins/protocollib/ -->
-		<dependency>
-			<groupId>com.comphenix.attribute</groupId>
-			<artifactId>AttributeStorage</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.bukkit</groupId>
-					<artifactId>bukkit</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.bukkit</groupId>
-					<artifactId>craftbukkit</artifactId>
-				</exclusion>
-			</exclusions>
-			<optional>true</optional>
-		</dependency>
-
-		<!--ProtocolLib http://dev.bukkit.org/bukkit-plugins/protocollib/ -->
 		<dependency>
 			<groupId>com.comphenix.protocol</groupId>
 			<artifactId>ProtocolLib</artifactId>
@@ -411,7 +369,7 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- Essentials plugin -->
+		<!-- EssentialsX plugin, http://www.spigotmc.org/resources/essentialsx.9089/ -->
 		<dependency>
 			<groupId>net.ess3</groupId>
 			<artifactId>EssentialsX</artifactId>
@@ -426,7 +384,7 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- Anti PvPLogging plugin, https://github.com/MinelinkNetwork/CombatTagPlus -->
+		<!-- Anti-PvPLogging plugin, https://github.com/MinelinkNetwork/CombatTagPlus -->
 		<dependency>
 			<groupId>net.minelink</groupId>
 			<artifactId>CombatTagPlus</artifactId>

src/main/java/fr/xephi/authme/DataManager.java

@@ -108,8 +108,8 @@ public class DataManager {
                     continue;
                 }
 
-                try {
+                try {
-                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getUniqueId() + ".dat");
+                    File playerFile = new File(plugin.getServer().getWorldContainer() + File.separator + Settings.defaultWorld + File.separator + "players" + File.separator + player.getUniqueId() + ".dat");
                     playerFile.delete();
                     i++;
                 } catch(Exception ignore) {
@@ -129,12 +129,12 @@ public class DataManager {
     public void purgeEssentials(List<String> cleared) {
         int i = 0;
         for (String name : cleared) {
-            try {
+            try {
                 File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + plugin.getServer().getOfflinePlayer(name).getUniqueId() + ".yml");                    
                 playerFile.delete();
                 i++;
             } catch (Exception e) {
-                File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + name + ".yml");
+                File playerFile = new File(plugin.ess.getDataFolder() + File.separator + "userdata" + File.separator + name + ".yml");
                 if (playerFile.exists()) {
                     playerFile.delete();
                     i++;
@@ -186,7 +186,7 @@ public class DataManager {
 
     public Player getOnlinePlayerLower(String name) {
         name = name.toLowerCase();
-        for (Player player : Bukkit.getOnlinePlayers()) {
+        for (Player player : Utils.getOnlinePlayers()) {
             if (player.getName().equalsIgnoreCase(name))
                 return player;
         }

src/main/java/fr/xephi/authme/settings/Settings.java

@@ -55,9 +55,12 @@ public final class Settings extends YamlConfiguration {
     public static boolean useLogging = false;
     public static int purgeDelay = 60;
 
+    // Due to compatibility issues with plugins like FactionsChat
+    public static Boolean isChatAllowed;
+
     public static boolean isPermissionCheckEnabled, isRegistrationEnabled,
             isForcedRegistrationEnabled, isTeleportToSpawnEnabled,
-            isSessionsEnabled, isChatAllowed, isAllowRestrictedIp,
+            isSessionsEnabled, isAllowRestrictedIp,
             isMovementAllowed, isKickNonRegisteredEnabled,
             isForceSingleSessionEnabled, isForceSpawnLocOnJoinEnabled,
             isSaveQuitLocationEnabled, isForceSurvivalModeEnabled,