Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Spaces in pom + optimizations

Browse Source
This commit is contained in:
Gabriele C 2015-08-02 14:22:34 +02:00
parent 5ac5bfc9a4
commit acbae36ddf
4 changed files with 542 additions and 582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
pom.xml
View File

@ -7,8 +7,6 @@
<artifactId>authme</artifactId>
<version>5.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>AuthMeReloaded</name>
<description>Authentication plugin for CraftBukkit/Spigot!</description>
<inceptionYear>2013</inceptionYear>
@ -19,7 +17,6 @@
<connection>scm:git:https://github.com/Xephi/AuthMeReloaded.git</connection>
<developerConnection>scm:git:git@github.com:Xephi/AuthMeReloaded.git</developerConnection>
<url>http://github.com/Xephi/AuthMeReloaded</url>
<tag>HEAD</tag>
</scm>
<!-- Official Build Server -->
@ -42,58 +39,32 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Change Compiler Version (JDK) HERE! -->
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<javaVersion>1.7</javaVersion>
<!-- Change MC Version HERE! -->
<bukkitVersion>1.8.8-R0.1-SNAPSHOT</bukkitVersion>
<jarPluginName>AuthMe</jarPluginName>
</properties>
<build>
<finalName>${project.name}-${project.version}</finalName>
<resources>
<resource>
<targetPath>.</targetPath>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources/</directory>
<includes>
<include>*.yml</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.3</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>target/classes/plugin.yml</file>
<replacements>
<replacement>
<token>maven-version</token>
<value>${project.version}</value>
</replacement>
</replacements>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestFile>${manifest.file}</manifestFile>
</archive>
<finalName>${jarPluginName}-${project.version}</finalName>
<source>1.7</source>
<target>${javaVersion}</target>
</configuration>
</plugin>
<plugin>
@ -128,15 +99,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.versioneye</groupId>
<artifactId>versioneye-maven-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<projectId>55bab9e8653762002000190a</projectId>
<!--<apiKey>my_secret_api_key</apiKey> -->
</configuration>
</plugin>
</plugins>
</build>
@ -208,7 +170,7 @@
<!-- Maven Dependencies -->
<!-- MySql Library -->
<!-- MySql Connection Pool -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
@ -268,26 +230,16 @@
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
</exclusion>
<exclusion>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project,
http://bukkit.org/ -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>${bukkitVersion}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>bungeecord-chat</artifactId>
<groupId>net.md-5</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- Attribute -->

1
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -120,6 +120,7 @@ public class AuthMe extends JavaPlugin {
this.database = database;
}
@SuppressWarnings("deprecation")
@Override
public void onEnable() {
authme = this;

6
src/main/java/fr/xephi/authme/cache/backup/FileCache.java vendored
View File

@ -504,7 +504,8 @@ public class FileCache {
armours[i] = attributes.getStack();
else armours[i] = item;
}
} catch (final RuntimeException e) {
ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming...");
} catch (final Exception e) {
ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming...");
} finally {
@ -513,6 +514,9 @@ public class FileCache {
}
return new DataFileCache(inv, armours, group, op, flying);
}
} catch (RuntimeException e) {
ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming...");
return null;
} catch (Exception e) {
ConsoleLogger.showError("Error while reading file for " + player.getName() + ", some wipe inventory incoming...");
return null;

3
src/main/java/fr/xephi/authme/commands/AdminCommand.java
View File

@ -477,6 +477,7 @@ public class AdminCommand implements CommandExecutor {
m.send(sender, "error");
return true;
}
@SuppressWarnings("deprecation")
Player target = Bukkit.getPlayer(name);
PlayerCache.getInstance().removePlayer(name);
Utils.getInstance().setGroup(name, groupType.UNREGISTERED);
@ -559,6 +560,7 @@ public class AdminCommand implements CommandExecutor {
sender.sendMessage("Usage: /authme getip <onlineplayername>");
return true;
}
@SuppressWarnings("deprecation")
Player player = Bukkit.getPlayer(args[1]);
if (player == null) {
sender.sendMessage("This player is not actually online");
@ -574,6 +576,7 @@ public class AdminCommand implements CommandExecutor {
return true;
}
try {
@SuppressWarnings("deprecation")
Player player = Bukkit.getPlayer(args[1]);
if (player == null || !player.isOnline()) {
sender.sendMessage("Player needs to be online!");