Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-23 10:45:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20 from Xephi/master

Browse Source 
Up
This commit is contained in:
Gabriele C. 2015-07-31 02:17:48 +02:00
commit 55778bdf49
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -5,9 +5,9 @@
- Developers ChatRoom: [![Join the chat at https://gitter.im/Xephi/AuthMeReloaded](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Xephi/AuthMeReloaded?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - Developers ChatRoom: [![Join the chat at https://gitter.im/Xephi/AuthMeReloaded](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Xephi/AuthMeReloaded?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
- Build status (Travis): [![Build Status](https://travis-ci.org/Xephi/AuthMeReloaded.svg?branch=master)](https://travis-ci.org/Xephi/AuthMeReloaded) - Build status: [![Build Status](https://travis-ci.org/Xephi/AuthMeReloaded.svg?branch=master)](https://travis-ci.org/Xephi/AuthMeReloaded) [![Dependency Status](https://www.versioneye.com/user/projects/55bab9e8653762002000190a/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55bab9e8653762002000190a)
- Build status (CircleCI): [CircleCI project Page](https://circleci.com/gh/xephi/AuthMeReloaded) - Build status (CircleCI): [![Circle CI](https://circleci.com/gh/Xephi/AuthMeReloaded.svg?style=svg)](https://circleci.com/gh/Xephi/AuthMeReloaded)
- Build Server (<strong>DEVELOPMENT BUILDS</strong>): <a href="http://ci.xephi.fr">Xephi's Jenkins</a> - Build Server (<strong>DEVELOPMENT BUILDS</strong>): <a href="http://ci.xephi.fr">Xephi's Jenkins</a>

4
pom.xml
View File

@ -81,7 +81,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.3</version> <version>2.4.1</version>
<configuration> <configuration>
<artifactSet> <artifactSet>
<includes> <includes>
@ -202,7 +202,7 @@
<dependency> <dependency>
<groupId>com.maxmind.geoip</groupId> <groupId>com.maxmind.geoip</groupId>
<artifactId>geoip-api</artifactId> <artifactId>geoip-api</artifactId>
<version>1.2.14</version> <version>1.2.15</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

2
src/main/java/fr/xephi/authme/datasource/MySQL.java
View File

@ -162,7 +162,7 @@ public class MySQL implements DataSource {
rs.close(); rs.close();
rs = con.getMetaData().getColumns(null, null, tableName, columnRealName); rs = con.getMetaData().getColumns(null, null, tableName, columnRealName);
if (!rs.next()) { if (!rs.next()) {
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnRealName + " VARCHAR(255) DEFAULT 'Player' AFTER " + columnLogged + ";"); st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnRealName + " VARCHAR(255) NOT NULL DEFAULT 'Player' AFTER " + columnLogged + ";");
} }
} finally { } finally {
close(rs); close(rs);

2
src/main/java/fr/xephi/authme/datasource/SQLite.java
View File

@ -130,7 +130,7 @@ public class SQLite implements DataSource {
rs.close(); rs.close();
rs = con.getMetaData().getColumns(null, null, tableName, columnRealName); rs = con.getMetaData().getColumns(null, null, tableName, columnRealName);
if (!rs.next()) { if (!rs.next()) {
st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnRealName + " VARCHAR(255) DEFAULT 'Player';"); st.executeUpdate("ALTER TABLE " + tableName + " ADD COLUMN " + columnRealName + " VARCHAR(255) NOT NULL DEFAULT 'Player';");
} }
} finally { } finally {
close(rs); close(rs);

2
src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
View File

@ -101,7 +101,7 @@ public class AsyncronousJoin {
final Location spawnLoc = plugin.getSpawnLocation(player); final Location spawnLoc = plugin.getSpawnLocation(player);
if (database.isAuthAvailable(name)) { if (database.isAuthAvailable(name)) {
PlayerAuth auth = database.getAuth(name); PlayerAuth auth = database.getAuth(name);
if (!auth.getRealName().equals("Player") && !auth.getRealName().equals(player.getName())) { if (auth.getRealName() != null && !auth.getRealName().equals("Player") && !auth.getRealName().equals(player.getName())) {
final GameMode gM = AuthMePlayerListener.gameMode.get(name); final GameMode gM = AuthMePlayerListener.gameMode.get(name);
sched.scheduleSyncDelayedTask(plugin, new Runnable() { sched.scheduleSyncDelayedTask(plugin, new Runnable() {