From 1cc131132309feb1247e142b4d5fc18e7453fd70 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Fri, 31 Jul 2015 01:57:40 +0200 Subject: [PATCH 1/4] little fix to lowercase issue --- src/main/java/fr/xephi/authme/datasource/MySQL.java | 2 +- src/main/java/fr/xephi/authme/datasource/SQLite.java | 2 +- src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/datasource/MySQL.java b/src/main/java/fr/xephi/authme/datasource/MySQL.java index 8a93aa89..4f4f96b5 100644 --- a/src/main/java/fr/xephi/authme/datasource/MySQL.java +++ b/src/main/java/fr/xephi/authme/datasource/MySQL.java @@ -162,7 +162,7 @@ public class MySQL implements DataSource { rs.close(); rs = con.getMetaData().getColumns(null, null, tableName, columnRealName); 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 { close(rs); diff --git a/src/main/java/fr/xephi/authme/datasource/SQLite.java b/src/main/java/fr/xephi/authme/datasource/SQLite.java index 7bac1491..27d668e7 100644 --- a/src/main/java/fr/xephi/authme/datasource/SQLite.java +++ b/src/main/java/fr/xephi/authme/datasource/SQLite.java @@ -130,7 +130,7 @@ public class SQLite implements DataSource { rs.close(); rs = con.getMetaData().getColumns(null, null, tableName, columnRealName); 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 { close(rs); diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java index 2e72bde4..e6f259bd 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java @@ -102,7 +102,7 @@ public class AsyncronousJoin { final Location spawnLoc = plugin.getSpawnLocation(player); if (database.isAuthAvailable(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); sched.scheduleSyncDelayedTask(plugin, new Runnable() { From f1e17b0bd58b41186f0161f27647a68b9a1da441 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Fri, 31 Jul 2015 02:11:29 +0200 Subject: [PATCH 2/4] Update Dependency --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 316384fb..97d39eb4 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 + 2.4.1 @@ -202,7 +202,7 @@ com.maxmind.geoip geoip-api - 1.2.14 + 1.2.15 compile From e2af78432a295476397288617498a64c28919405 Mon Sep 17 00:00:00 2001 From: Alexandre Vanhecke Date: Fri, 31 Jul 2015 02:12:44 +0200 Subject: [PATCH 3/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12216e73..871d5442 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ - 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) From 28e56cc33e5f3908f665713f54bc418f486854e7 Mon Sep 17 00:00:00 2001 From: Alexandre Vanhecke Date: Fri, 31 Jul 2015 02:15:09 +0200 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 871d5442..b0dfe3f6 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ - 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 (DEVELOPMENT BUILDS): Xephi's Jenkins