From 83b1055df0fd8062c61d7a85a1961f6b3f4dbac0 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Tue, 14 Jul 2015 04:17:21 +0200 Subject: [PATCH 1/5] Try to restore inventory after register --- .../register/ProcessSyncronousPasswordRegister.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java index c2ffe57fd..c85988e46 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java @@ -16,6 +16,7 @@ import fr.xephi.authme.cache.limbo.LimboPlayer; import fr.xephi.authme.events.AuthMeTeleportEvent; import fr.xephi.authme.events.LoginEvent; import fr.xephi.authme.events.RegisterTeleportEvent; +import fr.xephi.authme.events.RestoreInventoryEvent; import fr.xephi.authme.settings.Messages; import fr.xephi.authme.settings.PlayersLogs; import fr.xephi.authme.settings.Settings; @@ -95,6 +96,14 @@ public class ProcessSyncronousPasswordRegister implements Runnable { player.teleport(tpEvent.getTo()); } } + if (Settings.protectInventoryBeforeLogInEnabled && limbo.getInventory() != null && limbo.getArmour() != null) { + RestoreInventoryEvent event = new RestoreInventoryEvent(player, limbo.getInventory(), limbo.getArmour()); + Bukkit.getPluginManager().callEvent(event); + if (!event.isCancelled() && event.getArmor() != null && event.getInventory() != null) { + player.getInventory().setContents(event.getInventory()); + player.getInventory().setArmorContents(event.getArmor()); + } + } limbo.getTimeoutTaskId().cancel(); limbo.getMessageTaskId().cancel(); LimboCache.getInstance().deleteLimboPlayer(name); From 7f7b713e6712589321fadef82aaf9c3a4a32aab8 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Tue, 14 Jul 2015 04:34:31 +0200 Subject: [PATCH 2/5] Send mail as html --- src/main/java/fr/xephi/authme/SendMailSSL.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java index 4a0c9dd84..bc60dfe93 100644 --- a/src/main/java/fr/xephi/authme/SendMailSSL.java +++ b/src/main/java/fr/xephi/authme/SendMailSSL.java @@ -75,7 +75,7 @@ public class SendMailSSL { message.setSubject(subject); message.setSentDate(new Date()); BodyPart messageBodyPart = new MimeBodyPart(); - messageBodyPart.setText(mailText); + messageBodyPart.setContent(mailText, "text/html"); Multipart multipart = new MimeMultipart(); multipart.addBodyPart(messageBodyPart); From 3fe1c4edae96881010096c7766bd2398717baad0 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Tue, 14 Jul 2015 05:05:16 +0200 Subject: [PATCH 3/5] Fix NPE --- src/main/java/fr/xephi/authme/AuthMe.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 748a9448f..172ac651c 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -543,8 +543,8 @@ public class AuthMe extends JavaPlugin { Location spawnLoc = world.getSpawnLocation(); for (int i = spawnPriority.length - 1; i >= 0; i--) { String s = spawnPriority[i]; - if (s.equalsIgnoreCase("default") && getDefaultSpawn() != null) - spawnLoc = getDefaultSpawn(); + if (s.equalsIgnoreCase("default") && getDefaultSpawn(world) != null) + spawnLoc = getDefaultSpawn(world); if (s.equalsIgnoreCase("multiverse") && getMultiverseSpawn(world) != null) spawnLoc = getMultiverseSpawn(world); if (s.equalsIgnoreCase("essentials") && getEssentialsSpawn() != null) @@ -557,8 +557,8 @@ public class AuthMe extends JavaPlugin { return spawnLoc; } - private Location getDefaultSpawn() { - return this.getServer().getWorld(Settings.defaultWorld).getSpawnLocation(); + private Location getDefaultSpawn(World world) { + return world.getSpawnLocation(); } private Location getMultiverseSpawn(World world) { From 66af5a4ff88216ddea13d84d880a0ebef216e00d Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Tue, 14 Jul 2015 05:28:00 +0200 Subject: [PATCH 4/5] Push beta3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b302035db..faf3a6d15 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ fr.xephi authme - 5.0-SNAPSHOT + 5.0-beta3 AuthMeReloaded Authentication plugin for CraftBukkit/Spigot! From 963e47b3ddc68c432bfe89e2878bf8cc52ca1789 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Tue, 14 Jul 2015 05:28:21 +0200 Subject: [PATCH 5/5] Revert also --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index faf3a6d15..b302035db 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ fr.xephi authme - 5.0-beta3 + 5.0-SNAPSHOT AuthMeReloaded Authentication plugin for CraftBukkit/Spigot!