From ac4ced5082a7632e5b179e441f4977bdccdf2166 Mon Sep 17 00:00:00 2001 From: Zach Iverson Date: Thu, 7 Jul 2011 19:47:28 -0400 Subject: [PATCH 1/2] - Fix bug reported here: http://forums.bukkit.org/threads/sec-xauth-v2-0-beta-3-offline-mode-security-suite-689-860-928-953.8712/page-21#post-447819 - Beta 3.5 release --- src/main/java/com/cypherx/xauth/datamanager/DataManager.java | 2 +- src/main/resources/plugin.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cypherx/xauth/datamanager/DataManager.java b/src/main/java/com/cypherx/xauth/datamanager/DataManager.java index 8fd6564..a62777c 100644 --- a/src/main/java/com/cypherx/xauth/datamanager/DataManager.java +++ b/src/main/java/com/cypherx/xauth/datamanager/DataManager.java @@ -705,7 +705,7 @@ public class DataManager { connect(); try { - stmt = connection.prepareStatement( + prepStmt = connection.prepareStatement( "DELETE FROM `" + xAuthSettings.tblStrike + "`" + " WHERE `host` = ?" ); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index cc0918a..6b638be 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: xAuth main: com.cypherx.xauth.xAuth -version: 2.0b3 +version: 2.0b3.5 description: Offline-Mode Security Suite author: CypherX commands: From 7d477cec96af28b683988b695bc13d9e40b95304 Mon Sep 17 00:00:00 2001 From: Zach Iverson Date: Thu, 7 Jul 2011 19:51:27 -0400 Subject: [PATCH 2/2] - Possible Easyban NPE fix --- .../com/cypherx/xauth/listeners/xAuthPlayerListener.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/cypherx/xauth/listeners/xAuthPlayerListener.java b/src/main/java/com/cypherx/xauth/listeners/xAuthPlayerListener.java index ff1e85e..349f1f6 100644 --- a/src/main/java/com/cypherx/xauth/listeners/xAuthPlayerListener.java +++ b/src/main/java/com/cypherx/xauth/listeners/xAuthPlayerListener.java @@ -54,6 +54,11 @@ public class xAuthPlayerListener extends PlayerListener { public void onPlayerJoin(PlayerJoinEvent event) { final Player player = event.getPlayer(); + + //Easyban fix? + if (player == null) + return; + xAuthPlayer xPlayer = plugin.getDataManager().getPlayerJoin(player.getName()); boolean isRegistered = xPlayer.isRegistered();