Dev - 3.1.2-DEV-3

Developpement status actually
Some Fixes for the 1.7.2
Remove some Magic Values
Fix threads not start correctly
Add a recall email adding message
Fix catpcha messages
Add multilines messages ( add &n )
Fix some inventory problem
Fix some events problem
Call login event after /register

src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java

@@ -106,13 +106,13 @@ public class PlayerAuth {
     }
 
     public String getHash() {
-        if(salt != null && !salt.isEmpty() && Settings.getPasswordHash == HashAlgorithm.MD5VB) {
-        	vBhash = "$MD5vb$"+salt+"$"+hash;
-            return vBhash;
-        }
-        else {
-        	return hash;
-        } 
+    	if (Settings.getPasswordHash == HashAlgorithm.MD5VB) {
+            if(salt != null && !salt.isEmpty() && Settings.getPasswordHash == HashAlgorithm.MD5VB) {
+            	vBhash = "$MD5vb$"+salt+"$"+hash;
+                return vBhash;
+            }
+    	}
+        return hash;
     }
 
     public String getSalt() {

src/main/java/fr/xephi/authme/cache/backup/FileCache.java

@@ -4,6 +4,8 @@ import java.io.File;
 import java.io.FileWriter;
 
 import java.util.Scanner;
+
+import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 
@@ -134,7 +136,7 @@ public class FileCache {
 				}
                         // can enchant item? size ofstring in file - 4  all / 2 = number of enchant
 				if (in[0].equals("i")) {
-					stacki[i] = new ItemStack(Integer.parseInt(in[1]),
+					stacki[i] = new ItemStack(Material.getMaterial(Integer.parseInt(in[1])),
 					Integer.parseInt(in[2]), Short.parseShort((in[3])));
 					if(in.length > 4 && !in[4].isEmpty()) {
 						for(int k=4;k<in.length-1;k++) {
@@ -144,7 +146,7 @@ public class FileCache {
 					}
 					i++;
 				} else {
-					stacka[a] = new ItemStack(Integer.parseInt(in[1]),
+					stacka[a] = new ItemStack(Material.getMaterial(Integer.parseInt(in[1])),
 							Integer.parseInt(in[2]), Short.parseShort((in[3])));
 					if(in.length > 4 && !in[4].isEmpty()) {
 						for(int k=4;k<in.length-1;k++) {

src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java

@@ -31,7 +31,7 @@ public class LimboCache {
         String name = player.getName().toLowerCase();
         Location loc = player.getLocation();
         loc.setY(loc.getY() + 0.4D);
-        int gameMode = player.getGameMode().getValue();
+        GameMode gameMode = player.getGameMode();
         ItemStack[] arm;
         ItemStack[] inv;
         boolean operator;
@@ -78,7 +78,7 @@ public class LimboCache {
             		player.sendMessage("Your inventory has been cleaned!");
             	}
             }
-            gameMode = 0;
+            gameMode = GameMode.SURVIVAL;
         }
         if(player.isDead()) {
         	loc = plugin.getSpawnLocation(player.getWorld());

src/main/java/fr/xephi/authme/cache/limbo/LimboPlayer.java

@@ -1,5 +1,6 @@
 package fr.xephi.authme.cache.limbo;
 
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.inventory.ItemStack;
 
@@ -11,12 +12,12 @@ public class LimboPlayer {
     private Location loc = null;
     private int timeoutTaskId = -1;
     private int messageTaskId = -1;
-    private int gameMode = 0;
+    private GameMode gameMode = GameMode.SURVIVAL;
     private boolean operator = false;
     private String group = null;
     private boolean flying = false;
 
-    public LimboPlayer(String name, Location loc, ItemStack[] inventory, ItemStack[] armour, int gameMode, boolean operator, String group, boolean flying) {
+    public LimboPlayer(String name, Location loc, ItemStack[] inventory, ItemStack[] armour, GameMode gameMode, boolean operator, String group, boolean flying) {
         this.name = name;
         this.loc = loc;
         this.inventory = inventory;
@@ -27,7 +28,7 @@ public class LimboPlayer {
         this.flying = flying;
     }
 
-    public LimboPlayer(String name, Location loc, int gameMode, boolean operator, String group, boolean flying) {
+    public LimboPlayer(String name, Location loc, GameMode gameMode, boolean operator, String group, boolean flying) {
         this.name = name;
         this.loc = loc;
         this.gameMode = gameMode;
@@ -65,7 +66,7 @@ public class LimboPlayer {
     	this.inventory = inventory;
     }
 
-    public int getGameMode() {
+    public GameMode getGameMode() {
         return gameMode;
     }