Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-26 02:27:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git

Browse Source
This commit is contained in:
Xephi59 2016-02-28 00:36:15 +01:00
commit 2a8ef88041
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pom.xml
View File

@ -48,7 +48,9 @@
</prerequisites> </prerequisites>
<properties> <properties>
<!-- Project Encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
<!-- Project Properties --> <!-- Project Properties -->
<pluginName>AuthMe</pluginName> <pluginName>AuthMe</pluginName>
@ -57,9 +59,6 @@
<pluginAuthors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu</pluginAuthors> <pluginAuthors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu</pluginAuthors>
<buildNumber>Unknown</buildNumber> <buildNumber>Unknown</buildNumber>
<!-- Change Compiler Version (JDK) HERE! -->
<javaVersion>1.7</javaVersion>
<!-- Change Bukkit Version HERE! --> <!-- Change Bukkit Version HERE! -->
<bukkitVersion>1.9-pre1-SNAPSHOT</bukkitVersion> <bukkitVersion>1.9-pre1-SNAPSHOT</bukkitVersion>
</properties> </properties>
@ -147,14 +146,26 @@
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<!-- Maven Java Compiler --> <!-- Maven Java Compiler (compile under 1.8 but allow 1.7/1.6 thanks to Retrolambda) -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version> <version>3.5.1</version>
<configuration> <configuration>
<source>1.7</source> <source>1.8</source>
<target>${javaVersion}</target> <target>1.8</target>
<!-- We need to run tests with java 1.7 to avoid errors with retrolambda! -->
<testSource>1.7</testSource>
<testTarget>1.7</testTarget>
</configuration>
</plugin>
<!-- Test Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
<configuration>
<argLine>-Dfile.encoding=UTF-8</argLine>
</configuration> </configuration>
</plugin> </plugin>
<!-- Libs Shading and Relocation --> <!-- Libs Shading and Relocation -->
@ -717,7 +728,7 @@
<dependency> <dependency>
<groupId>net.minelink</groupId> <groupId>net.minelink</groupId>
<artifactId>CombatTagPlus</artifactId> <artifactId>CombatTagPlus</artifactId>
<version>1.2.1-SNAPSHOT</version> <version>1.2.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

2
src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
View File

@ -38,7 +38,6 @@ public class ProcessSyncPlayerLogin implements Runnable {
private final String name; private final String name;
private final PlayerAuth auth; private final PlayerAuth auth;
private final AuthMe plugin; private final AuthMe plugin;
private final DataSource database;
private final PluginManager pm; private final PluginManager pm;
private final JsonCache playerCache; private final JsonCache playerCache;
private final NewSetting settings; private final NewSetting settings;
@ -54,7 +53,6 @@ public class ProcessSyncPlayerLogin implements Runnable {
public ProcessSyncPlayerLogin(Player player, AuthMe plugin, public ProcessSyncPlayerLogin(Player player, AuthMe plugin,
DataSource database, NewSetting settings) { DataSource database, NewSetting settings) {
this.plugin = plugin; this.plugin = plugin;
this.database = database;
this.pm = plugin.getServer().getPluginManager(); this.pm = plugin.getServer().getPluginManager();
this.player = player; this.player = player;
this.name = player.getName().toLowerCase(); this.name = player.getName().toLowerCase();

2
src/main/java/fr/xephi/authme/settings/Settings.java
View File

@ -84,7 +84,6 @@ public final class Settings {
getMaxJoinPerIp; getMaxJoinPerIp;
protected static FileConfiguration configFile; protected static FileConfiguration configFile;
private static AuthMe plugin; private static AuthMe plugin;
private static Settings instance;
/** /**
* Constructor for Settings. * Constructor for Settings.
@ -92,7 +91,6 @@ public final class Settings {
* @param pl AuthMe * @param pl AuthMe
*/ */
public Settings(AuthMe pl) { public Settings(AuthMe pl) {
instance = this;
plugin = pl; plugin = pl;
configFile = plugin.getConfig(); configFile = plugin.getConfig();
loadVariables(); loadVariables();

4
src/main/java/fr/xephi/authme/util/Profiler.java
View File

@ -2,15 +2,13 @@ package fr.xephi.authme.util;
import java.text.DecimalFormat; import java.text.DecimalFormat;
/**
*/
@SuppressWarnings("UnusedDeclaration")
public class Profiler { public class Profiler {
/** /**
* Defines the past time in milliseconds. * Defines the past time in milliseconds.
*/ */
private long time = 0; private long time = 0;
/** /**
* Defines the time in milliseconds the profiler last started at. * Defines the time in milliseconds the profiler last started at.
*/ */