Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.7.10b2

Browse Source
This commit is contained in:
Alexandre V. 2013-03-10 01:29:07 +01:00
parent f7e7b3e252
commit 6a3dc273ed
6 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -28,7 +28,7 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<version>2.7.10b1</version> <version>2.7.10b2</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>

6
src/main/java/uk/org/whoami/authme/cache/backup/DataFileCache.java vendored
View File

@ -27,8 +27,8 @@ public class DataFileCache {
public DataFileCache(ItemStack[] inventory, ItemStack[] armor, String group, boolean operator){ public DataFileCache(ItemStack[] inventory, ItemStack[] armor, String group, boolean operator){
this.inventory = inventory; this.inventory = inventory;
this.armor = armor; this.armor = armor;
this.group = group; this.group = group;
this.operator = operator; this.operator = operator;
} }
public ItemStack[] getInventory(){ public ItemStack[] getInventory(){
return inventory; return inventory;
@ -43,7 +43,7 @@ public class DataFileCache {
} }
public Boolean getOperator(){ public Boolean getOperator(){
return operator; return operator;
} }
} }

28
src/main/java/uk/org/whoami/authme/cache/backup/FileCache.java vendored
View File

@ -15,8 +15,6 @@ import java.util.Scanner;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import uk.org.whoami.authme.ConsoleLogger;
public class FileCache { public class FileCache {
//private HashMap<Enchantment, Integer> ench; //private HashMap<Enchantment, Integer> ench;
@ -71,14 +69,9 @@ public class FileCache {
for(Enchantment e : invstack[i].getEnchantments().keySet()) for(Enchantment e : invstack[i].getEnchantments().keySet())
{ {
try { //System.out.println("enchant "+e.getName()+" bog "+invstack[i].getEnchantmentLevel(e));
enchList = enchList.concat(e.getName()+":"+invstack[i].getEnchantmentLevel(e)+":"); enchList = enchList.concat(e.getName()+":"+invstack[i].getEnchantmentLevel(e)+":");
} catch (NullPointerException npe) { //System.out.println(enchList);
ConsoleLogger.showError(npe.getMessage());
ConsoleLogger.showError("The player " + playername + " has an illegaly enchant, Check Him !");
}
} }
} }
@ -103,13 +96,9 @@ public class FileCache {
for(Enchantment e : armorstack[i].getEnchantments().keySet()) for(Enchantment e : armorstack[i].getEnchantments().keySet())
{ {
try { //System.out.println("enchant "+e.getName()+" bog "+armorstack[i].getEnchantmentLevel(e));
enchList = enchList.concat(e.getName()+":"+armorstack[i].getEnchantmentLevel(e)+":"); enchList = enchList.concat(e.getName()+":"+armorstack[i].getEnchantmentLevel(e)+":");
} catch (NullPointerException npe) { //System.out.println(enchList);
ConsoleLogger.showError(npe.getMessage());
ConsoleLogger.showError("The player " + playername + " has an illegaly enchant, Check Him !");
}
} }
} }
@ -170,7 +159,8 @@ public class FileCache {
} }
// can enchant item? size ofstring in file - 4 all / 2 = number of enchant // can enchant item? size ofstring in file - 4 all / 2 = number of enchant
if (in[0].equals("i")) { if (in[0].equals("i")) {
stacki[i] = new ItemStack(Integer.parseInt(in[1]),
stacki[i] = new ItemStack(Integer.parseInt(in[1]),
Integer.parseInt(in[2]), Short.parseShort((in[3]))); Integer.parseInt(in[2]), Short.parseShort((in[3])));
// qui c'e' un problema serio! // qui c'e' un problema serio!
if(in.length > 4 && !in[4].isEmpty()) { if(in.length > 4 && !in[4].isEmpty()) {
@ -182,7 +172,7 @@ public class FileCache {
} }
i++; i++;
} else { } else {
stacka[a] = new ItemStack(Integer.parseInt(in[1]), stacka[a] = new ItemStack(Integer.parseInt(in[1]),
Integer.parseInt(in[2]), Short.parseShort((in[3]))); Integer.parseInt(in[2]), Short.parseShort((in[3])));
if(in.length > 4 && !in[4].isEmpty()) { if(in.length > 4 && !in[4].isEmpty()) {
for(int k=4;k<in.length-1;k++) { for(int k=4;k<in.length-1;k++) {

9
src/main/java/uk/org/whoami/authme/listener/AuthMePlayerListener.java
View File

@ -722,12 +722,9 @@ public class AuthMePlayerListener implements Listener {
} }
// isent in session or session was ended correctly // isent in session or session was ended correctly
LimboCache.getInstance().addLimboPlayer(player); LimboCache.getInstance().addLimboPlayer(player);
try { DataFileCache dataFile = new DataFileCache(LimboCache.getInstance().getLimboPlayer(name).getInventory(),LimboCache.getInstance().getLimboPlayer(name).getArmour());
playerBackup.createCache(name, new DataFileCache(LimboCache.getInstance().getLimboPlayer(name).getInventory(),LimboCache.getInstance().getLimboPlayer(name).getArmour()), LimboCache.getInstance().getLimboPlayer(name).getGroup(),LimboCache.getInstance().getLimboPlayer(name).getOperator()); playerBackup.createCache(name, dataFile, LimboCache.getInstance().getLimboPlayer(name).getGroup(),LimboCache.getInstance().getLimboPlayer(name).getOperator());
} catch (NullPointerException npe) {
ConsoleLogger.showError("Problem while trying to create player cache for : " + name);
}
} else { } else {
if(!Settings.unRegisteredGroup.isEmpty()){ if(!Settings.unRegisteredGroup.isEmpty()){

2
src/main/resources/plugin.yml
View File

@ -3,7 +3,7 @@ author: darkwarriros,Xephi
website: http://www.multiplayer-italia.com/ website: http://www.multiplayer-italia.com/
description: AuthMe prevents people, which aren't logged in, from doing stuff like placing blocks, moving, typing commands or seeing the inventory of the current player. description: AuthMe prevents people, which aren't logged in, from doing stuff like placing blocks, moving, typing commands or seeing the inventory of the current player.
main: uk.org.whoami.authme.AuthMe main: uk.org.whoami.authme.AuthMe
version: 2.7.10b1 version: 2.7.10b2
softdepend: [Vault, ChestShop, Spout, Multiverse-Core, Notifications, Citizens, CombatTag] softdepend: [Vault, ChestShop, Spout, Multiverse-Core, Notifications, Citizens, CombatTag]
commands: commands:
register: register:

37
src/plugin.yml
View File

@ -3,8 +3,8 @@ author: darkwarriros,Xephi
website: http://www.multiplayer-italia.com/ website: http://www.multiplayer-italia.com/
description: AuthMe prevents people, which aren't logged in, from doing stuff like placing blocks, moving, typing commands or seeing the inventory of the current player. description: AuthMe prevents people, which aren't logged in, from doing stuff like placing blocks, moving, typing commands or seeing the inventory of the current player.
main: uk.org.whoami.authme.AuthMe main: uk.org.whoami.authme.AuthMe
version: 2.7.2b3 version: 2.7.10b2
softdepend: [Vault] softdepend: [Vault, ChestShop, Spout, Multiverse-Core, Notifications, Citizens, CombatTag]
commands: commands:
register: register:
description: Register an account description: Register an account
@ -29,6 +29,12 @@ commands:
authme: authme:
description: AuthMe op commands description: AuthMe op commands
usage: '/authme reload|register playername password|changepassword playername password|unregister playername|version' usage: '/authme reload|register playername password|changepassword playername password|unregister playername|version'
email:
description: Add Email or recover password
usage: '/email add your@email.com your@email.com|change oldEmail newEmail|recovery your@email.com'
captcha:
description: Captcha
usage: /captcha theCaptcha
permissions: permissions:
authme.player.*: authme.player.*:
description: Gives access to all authme player commands description: Gives access to all authme player commands
@ -50,6 +56,10 @@ permissions:
authme.admin.changepassword: true authme.admin.changepassword: true
authme.admin.unregister: true authme.admin.unregister: true
authme.admin.purge: true authme.admin.purge: true
authme.seeOtherAccounts: true
authme.admin.lastlogin: true
authme.admin.getemail: true
authme.admin.chgemail: true
authme.register: authme.register:
description: Register an account description: Register an account
default: true default: true
@ -62,12 +72,18 @@ permissions:
authme.logout: authme.logout:
description: Logout description: Logout
default: true default: true
authme.email:
description: Email
default: true
authme.passpartu: authme.passpartu:
description: passpartu description: passpartu
default: true default: true
authme.allow2accounts: authme.allow2accounts:
description: allow more accounts for same ip description: allow more accounts for same ip
default: false default: false
authme.seeOtherAccounts:
description: display other accounts about a player when he logs in
default: false
authme.unregister: authme.unregister:
description: unregister your account description: unregister your account
default: true default: true
@ -94,4 +110,19 @@ permissions:
default: op default: op
authme.admin.lastlogin: authme.admin.lastlogin:
description: Get last login date about a player description: Get last login date about a player
default: op default: op
authme.admin.getemail:
description: Get last email about a player
default: op
authme.admin.chgemail:
description: Change a player email
default: op
authme.admin.accounts:
description: Display Players Accounts
default: op
authme.admin.xauthimport:
description: Import xAuth Database to AuthMe Database
default: op
authme.captcha:
description: Captcha
default: true