Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-29 12:07:35 +01:00
Code Issues Projects Releases Wiki Activity
1,685 Commits 47 Branches 8 Tags 102 MiB
663e3063d7
Commit Graph

1256 Commits

Author SHA1 Message Date
DNx
9f199b1a5a Update AuthMePlayerListener.java 2015-11-25 05:04:38 +07:00
ljacqu
cf4e47488b Start refactoring for Messages class 2015-11-24 22:54:54 +01:00
ljacqu
2e5b7ecf29 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into enums 2015-11-24 22:21:53 +01:00
ljacqu
72fe710b8c Fix UtilsTest, create MessageKeyTest 2015-11-24 22:21:36 +01:00
Gabriele C
a983253384 better names 2015-11-24 22:08:06 +01:00
ljacqu
e4c82e04ff Merge upstream/master into ljacqu/enums 2015-11-24 21:59:55 +01:00
Gabriele C
e9b2517188 enhance the removespeed feature 2015-11-24 21:55:55 +01:00
Gabriele C
43b9462ddc cleanup 2015-11-24 21:13:09 +01:00
Gabriele C
28e742e42f cleanup 2015-11-24 19:04:18 +01:00
Gabriele C
cc8401e841 Move the antibot management 2015-11-24 18:51:09 +01:00
DNx5
489708b206 i forgot about the hotbar. 2015-11-25 00:44:38 +07:00
DNx5
ea420ab05f set protect inventory to false in config file if protocol lib is not found. 2015-11-25 00:43:55 +07:00
DNx5
25c23e144c - send blank inventory on logout if protect inventory is enabled. 
- added reload support for protect inventory option.
 2015-11-25 00:14:45 +07:00
Gabriele C
fb6ddb4b59 Cleanup 2015-11-24 17:47:10 +01:00
DNx5
bc223b04f9 shouldn't allow movement event noTeleport enabled. 2015-11-24 22:14:14 +07:00
DNx5
e39ab8a644 removed old GeoIP data check. 2015-11-24 22:08:09 +07:00
DNx5
5be476e2d6 ignore yaw changes in player move event. 2015-11-24 21:55:55 +07:00
Bogdan
8933c55de4 Change some Color Codes in messages_ru.yml 2015-11-24 10:35:10 +02:00
DNx5
8e9bfc6299 update playerloginevent and some listener. 
i hope it will fix the lag issues.
 2015-11-24 07:15:58 +07:00
DNx5
b4b92e5a93 reordering local variable scope in captcha command 2015-11-24 05:46:28 +07:00
ljacqu
16a69d4126 Merge upstream/master into ljacqu/enums 2015-11-23 23:31:26 +01:00
ljacqu
6422f90114 Create Wrapper for instances / revise MockUtils 
- Add test resources folder
- Create basic test for Messages (todo: add concrete tests)
- Create WrapperMock
- Change UtilsTest (todo: make it work)
 2015-11-23 23:25:03 +01:00
DNx5
d7f9b602c7 update some Utils method 2015-11-24 04:43:29 +07:00
Tim Visée
09067ddbd1 Removed redundant code, fixed some warnings, other minor fixes 2015-11-23 22:18:04 +01:00
Tim Visée
82bf0f45ca Finalized some fields, removed redundant code, various other fixes 2015-11-23 22:14:03 +01:00
Tim Visée
83e5d726af Improved various code bits 2015-11-23 22:12:01 +01:00
Tim Visée
1dd540b9c0 Fixed some redundant casts and definitions 2015-11-23 22:09:15 +01:00
Tim Visée
47b1d00ccf Fixed various spelling and grammar issues 2015-11-23 22:07:32 +01:00
Tim Visée
36c50c4507 Reformatted code with new code style 2015-11-23 21:46:34 +01:00
Tim Visée
b2db25d16c Improved JavaDocs code style, some minor improvements 2015-11-23 21:45:23 +01:00
Tim Visée
f15eaae67f Some minor automatic fixes and changes 2015-11-23 21:43:40 +01:00
Tim Visée
53117928f5 Reformatted all files once again 2015-11-23 21:40:11 +01:00
Tim Visée
2e868c7492 Reformatted all code files, cleaned up the project 2015-11-23 21:33:08 +01:00
ljacqu
8719cce334 Create enum for message keys in Messages 2015-11-23 21:13:12 +01:00
Gabriele C
10435657c5 Fix enableBackup option 2015-11-23 20:59:25 +01:00
Gabriele C
614aa9d5e5 Fix noTeleport in the PlayerListener 2015-11-23 20:59:13 +01:00
AuthMe-Team
9ec2d6d059 Stuff from the common floobits workspace 
Author:    AuthMe-Team <AuthMeTeam@123NoEmail.com>
 2015-11-23 20:23:52 +01:00
Gabriele C
69a09aec17 cleanup 2015-11-22 21:06:08 +01:00
Tim Visée
da662afcf4 Created method to get an exception stack trace as a string 2015-11-22 21:01:31 +01:00
ljacqu
215fedc585 Minor refactoring in CustomConfiguration / Messages 
- CustomConfiguration should be abstract
- Reduce visibility of internal method
- Fix typo in English messages
- Remove or replace unnecessary javadoc
 2015-11-22 02:02:49 +01:00
ljacqu
e456203fc6 Refactor Utils#getOnlinePlayers and add background info 2015-11-22 01:30:07 +01:00
ljacqu
fc3f685de0 Create UtilsTest 
Had to create a getGameServer() method in AuthMe in order to be able to catch this call in tests and replace it with a mock implementation of the actual server. The supertype method getServer() is declared as final, which makes it impossible to mock with Mockito.

While there are frameworks that manipulate the bytecode to mock final calls, it is much easier and less risky to simply delegate the server retrieval through another method.
 2015-11-21 23:09:04 +01:00
ljacqu
cd728b569e Create test for CommandManager; fix javadoc in CommandDescription 2015-11-21 22:32:16 +01:00
Tim Visée
1ba18439e9 Fixed invalid method arguments 2015-11-21 21:08:07 +01:00
Tim Visée
ada991904b Improved purgePermissions method 2015-11-21 21:07:32 +01:00
Tim Visée
e45aa88504 Fixed result not being returned 2015-11-21 21:03:50 +01:00
Tim Visée
18af8f3171 Fixed addLimboPlayer method 2015-11-21 21:02:53 +01:00
Tim Visée
0a5c081732 Added method to permissions manager to get primary group of player 2015-11-21 20:59:23 +01:00
Tim Visée
89b5444d69 Fixed addNormal method, updated it's JavaDocs 2015-11-21 20:50:12 +01:00
Tim Visée
7902cd87bb Added return statement for setGroup method, updated it's JavaDocs 2015-11-21 20:47:56 +01:00
Gabriele C
579c51f4a2 Remove the old Vault group management system. (THIS COMMIT BREAKS THE COMPILATION) 2015-11-21 20:16:07 +01:00
ljacqu
7f049616c6 Attempt to fix dubious isUuidInstance in vAuthFileReader 2015-11-21 20:06:31 +01:00
ljacqu
efb57989ed Start tests for email commands 
- Removed randomStringGenerator from Management as it is unused
 2015-11-21 19:51:49 +01:00
ljacqu
2922d04aa0 Merge branch 'unit-tests' of https://github.com/ljacqu/AuthMeReloaded into unit-tests 2015-11-21 19:39:26 +01:00
ljacqu
f06f7d8c77 Merge remote-tracking branch 'origin/unit-tests' into unit-tests 
Conflicts:
	src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
	src/test/java/fr/xephi/authme/AuthMeMockUtil.java
 2015-11-21 19:36:48 +01:00
Tim Visée
579b7e7b97 Improved some grammar and variable names 2015-11-21 19:24:25 +01:00
Tim Visée
a176aba350 Fixed horrible typo, implemented dynamic plugin name 2015-11-21 19:22:23 +01:00
Tim Visée
30b4cfe44e Added notice to legacy permissions instance in main class 2015-11-21 19:18:56 +01:00
ljacqu
b3d0a71dec Merge ListUtil into StringUtil; refactor HelpSyntaxHelper + create test 
The HelpSyntaxHelper had suppressed warnings for string concatenation within StringBuilder - the point of the StringBuilder is that it is faster when you use it to concatenate many elements. If you still use string concatenation with + within these calls it beats the purpose.
 2015-11-21 17:19:11 +01:00
ljacqu
a3f24bcb9a Create test for HelpSyntaxHelperTest 2015-11-21 17:18:58 +01:00
ljacqu
58dc15123c Add tests for LogoutCommand and RegisterCommand. Add more generic mockUtil 2015-11-21 17:18:45 +01:00
ljacqu
4e8614fdf7 Add test for LoginCommand; create AuthMe mock test util 
Had to create a getter for the Management instance in the AuthMe class for mocking, but fields should generally not be accessed globally. Hopefully soon we will be able to make the field private.
 2015-11-21 17:18:28 +01:00
ljacqu
d81ef3168e Command refactor - remove unused fields, reduce variable "scope" 
Minor refactorings in the command section for familiarization.

1. Removed suppressWarning("Deprecated") - the method is deprecated for a reason and we should be made aware of that.
2. Removed same javadoc on ExecutableCommand implementation that just had the same as the interface (this is just clutter; @Override signals that it's an implementing class and a developer can view the superclass javadoc)
3. In places where the AuthMe instance was retrieved at the top but used at the very bottom, moved it to the bottom to reduce its "scope"
 2015-11-21 17:18:14 +01:00
Tim Visée
8387924c64 Merge pull request #68 from ljacqu/master 
Revert certain JavaDoc changes
 2015-11-21 16:57:17 +01:00
Tim Visée
8181bda762 Minor update to hasGroupSupport method in permissions manager 2015-11-21 16:26:05 +01:00
Tim Visée
bb22daab33 Added some missing support for Nijikokun's Permissions in permissions manager 2015-11-21 16:21:38 +01:00
Tim Visée
6dc4066563 Added group support check to setGroups method in Utils class 2015-11-21 16:08:41 +01:00
Tim Visée
eaba2765fa Created hasGroupSupport method in permissions manager 2015-11-21 16:07:02 +01:00
Tim Visée
69d6518b30 Improved setGroup method in Utils class, to replace legacy permissions code 2015-11-21 16:03:00 +01:00
Tim Visée
973c683c90 Minor fix for PermissionsBukkit support in permissions manager 2015-11-21 15:47:59 +01:00
Tim Visée
cfaece3eae Simplefied some code 2015-11-21 15:46:10 +01:00
Tim Visée
f8cf9e2e48 Created inGroup method in permissions manager 2015-11-21 15:44:57 +01:00
Tim Visée
a05a97a0a6 Fixed setGroup method in permissions manager 2015-11-21 15:38:20 +01:00
Tim Visée
1091db0e15 Created removeAllGroups method in permissions manager 2015-11-21 15:34:38 +01:00
Tim Visée
f7f455a56a Created setGroups method in permissions manager 2015-11-21 15:24:53 +01:00
Tim Visée
a84e219899 Fixed minor Essentials Group Manager issue in addGroup method of permissions manager 2015-11-21 15:18:01 +01:00
Tim Visée
462a2e9878 Created removeGroups method in permissions manager 2015-11-21 15:16:19 +01:00
Tim Visée
bcf4eeab00 Created removeGroup method in permissions manager 2015-11-21 15:15:04 +01:00
Tim Visée
b07e4b62cc Created addGroups method in permissions manager 2015-11-21 15:07:46 +01:00
Tim Visée
a6fe728d79 Fixed addGroup method for PermissionsBukkit in permissions manager 2015-11-21 15:00:14 +01:00
Tim Visée
f4da63fee6 Added note to getGroups method in permissions manager for PermissionsBukkit 2015-11-21 14:57:34 +01:00
Tim Visée
42dee2e101 Created addGroup method in permissions manager 2015-11-21 14:44:43 +01:00
Tim Visée
400d014e7b Fixed setGroup in PermissionsManager for Essentials Group Manager and zPermissions 2015-11-21 14:41:14 +01:00
ljacqu
b633b9a005 Create test for change password command 2015-11-21 13:23:18 +01:00
ljacqu
4702a1b82d Merge ListUtil into StringUtil; refactor HelpSyntaxHelper + create test 
The HelpSyntaxHelper had suppressed warnings for string concatenation within StringBuilder - the point of the StringBuilder is that it is faster when you use it to concatenate many elements. If you still use string concatenation with + within these calls it beats the purpose.
(cherry picked from commit bb00be2)
 2015-11-21 12:12:26 +01:00
ljacqu
115680a363 Create test for HelpSyntaxHelperTest 
(cherry picked from commit 9a6e96d)
 2015-11-21 12:07:21 +01:00
ljacqu
e65319d42c Add tests for LogoutCommand and RegisterCommand. Add more generic mockUtil 
(cherry picked from commit 06cfd13)
 2015-11-21 12:07:10 +01:00
ljacqu
987e38c5df Add test for LoginCommand; create AuthMe mock test util 
Had to create a getter for the Management instance in the AuthMe class for mocking, but fields should generally not be accessed globally. Hopefully soon we will be able to make the field private.
(cherry picked from commit f1a0022)
 2015-11-21 12:07:00 +01:00
ljacqu
3934d67330 Command refactor - remove unused fields, reduce variable "scope" 
Minor refactorings in the command section for familiarization.

1. Removed suppressWarning("Deprecated") - the method is deprecated for a reason and we should be made aware of that.
2. Removed same javadoc on ExecutableCommand implementation that just had the same as the interface (this is just clutter; @Override signals that it's an implementing class and a developer can view the superclass javadoc)
3. In places where the AuthMe instance was retrieved at the top but used at the very bottom, moved it to the bottom to reduce its "scope"
(cherry picked from commit 45a50f3)
 2015-11-21 12:06:49 +01:00
ljacqu
9a68aa5517 Proper Javadoc example / add test for StringUtils 
- Proper example for the purpose of javadoc and how it could look like
- Fix containsAny to be null safe
- Add tests
 2015-11-21 08:28:53 +01:00
ljacqu
38cc217cff Revert certain JavaDoc changes 
Ideally JavaDoc should provide additional information to the developer
as to the method's purpose and usage. Typically you do not add the
return type of the method and the parameter's types since this can be
seen in the code.

A short description of what the parameter really is (e.g. a String can
hold many types of information) is a lot more beneficial. A JavaDoc
statement simply restating the parameter types and the method name is,
put bluntly, simply noise, since all of these things are already
contained in the code itself.

Similarly, @see references are great for pointing to other, related
methods but aren't very helpful to point to a superclass method (the
implemented or overriden method) since it is implied by @Override. A
developer can navigate easily to the superclass method with any
reasonable IDE.
 2015-11-21 07:41:56 +01:00
Tim Visée
504106f835 Added base of setGroup method in permissions manager 2015-11-21 03:01:45 +01:00
Tim Visée
06d6bd4a7e Fixed formatting in PermissionsManager class 2015-11-21 02:43:32 +01:00
Tim Visée
5ff9b7550e Combined Plugin and Server listener, removed plugin listener 2015-11-21 02:33:59 +01:00
Gabriele C
bd1f868c6d standard javadoc 2015-11-21 01:31:18 +01:00
Gabriele C
118c79401a Prepare the project for javadocs 2015-11-21 01:27:06 +01:00
Gabriele C
adcd70b91d auto cleanup 2015-11-21 01:15:52 +01:00
Gabriele C
ada992785c login process cleanup 2015-11-21 00:36:46 +01:00
Gabriele C
68ae6ee701 remove useless inventory store event 2015-11-20 23:59:25 +01:00
Gabriele C
d6355adb51 cleanup 2015-11-20 23:52:20 +01:00
Gabriele C
ba483af807 fix project layout 2015-11-20 23:43:26 +01:00
ljacqu
84de22c9c0 Refactor Log4JFilter and improve branch coverage 2015-11-20 23:17:50 +01:00
Tim Visée
4978f195f8 Use different logger in permissions manager 2015-11-20 20:50:45 +01:00
Tim Visée
a4b2306e16 Added some comments to legacy permissions methods 2015-11-20 20:23:52 +01:00
Tim Visée
3500ee6fb7 Replaced code that used legacy deprecated permissions methods 2015-11-20 20:23:03 +01:00
Tim Visée
33ca2691b2 Updated deprecated information for legacy permission methods 2015-11-20 20:16:02 +01:00
Tim Visée
8ba126b681 Updated permissions checking system in command handler 2015-11-20 20:13:23 +01:00
Tim Visée
10b69403fc Deprecated legacy permissions methods 2015-11-20 20:11:46 +01:00
Tim Visée
ffd36ba325 Updated authmePermissable methods in main class 2015-11-20 20:08:02 +01:00
Tim Visée
eae6eb384f Updated soft depends 2015-11-20 20:04:59 +01:00
Tim Visée
5e7e7a14fd Added comment to permissions manager 2015-11-20 20:03:44 +01:00
Tim Visée
71e24fe80a Improved permissions manager 2015-11-20 20:01:43 +01:00
Tim Visée
82e65250b8 Added permissions manager to main class, along with a setup and get method 2015-11-20 20:01:31 +01:00
Tim Visée
f17f1fe5fb Fixed plugin listener 2015-11-20 19:56:06 +01:00
Tim Visée
5df1dc2dfb Created plugin listener 2015-11-20 19:55:19 +01:00
Tim Visée
66365d6cf9 Removed unused code 2015-11-20 19:53:00 +01:00
Tim Visée
e3c4655b19 Added new permissions manager class, based on DungeonMaze's one 2015-11-20 19:43:10 +01:00
DNx5
9a79332933 add getPlayer method into Utils class 2015-11-17 09:32:33 +07:00
DNx5
3e1c7edb2d reorder isAuthAvailable call 2015-11-17 08:47:14 +07:00
DNx5
6bc5bb3cb1 optimize some code. 2015-11-17 06:54:24 +07:00
DNx5
f6c6a7c6d4 update and cleanup PlayerAuth 2015-11-17 05:04:34 +07:00
Xephi
4a49809ff2 Change to is Empty 2015-11-16 18:52:54 +01:00
DNx5
6f1af92a58 remove speed already done in join process 2015-11-15 04:49:03 +07:00
DNx5
1af937651c fix geoip lagging if server cant download the file. 2015-11-15 04:24:36 +07:00
Xephi59
3b802d03b1 Add non html content 2015-11-11 01:50:23 +01:00
Xephi59
46d39c7864 Fix attachment 2015-11-11 01:49:15 +01:00
Xephi59
10606a22e6 Change default mail api to apache one 2015-11-11 01:28:04 +01:00
Gabriele C
8a4f2c5ef8 I love to clean code and stuff 2015-11-10 19:28:17 +01:00
Gabriele C
2c45cece00 fix plugin name 
(i'm an idiot -_-)
 2015-11-10 18:43:24 +01:00
Gabriele C
7f4db3a85b cleanup 2015-11-10 18:38:01 +01:00
Xephi59
b959ea18c9 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2015-11-08 19:31:52 +01:00
Xephi59
6bff45f0ed Fix Mail Recovery 2015-11-08 19:31:44 +01:00
Gabriele C
1c2cc959cc cleanup 2015-11-08 14:51:55 +01:00
Xephi59
54c56461f1 Add 'l' alias to /login command 2015-11-08 14:50:04 +01:00
Xephi59
e1d1ebfca5 Move to old getPlayer method that always work and let us be more 
compatible
 2015-11-08 14:18:51 +01:00
Gabriele C
d4498521c3 Remove useless hikari sqlite mode 2015-11-08 01:35:13 +01:00
Gabriele C
ddda62aa14 cleaup 2015-11-07 00:13:29 +01:00
Xephi
6f56e865b7 We hope if player is authenticated, he is registered :') 2015-11-04 09:09:19 +01:00
Xephi
c16b80a2bf We don't need a final statement 2015-11-04 09:02:20 +01:00
Xephi59
f4d8e45733 Check for a null destination 2015-11-03 23:40:23 +01:00
Xephi
21ea54d604 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2015-11-03 15:23:14 +01:00
Xephi
76fa631184 Disable Hikari Cache definitively 2015-11-03 15:23:02 +01:00
DNx5
375162ab67 update email commands to use new async process 2015-11-03 14:41:05 +07:00
DNx5
4eb94787ac implement async change email into management class. 2015-11-03 14:22:32 +07:00
DNx5
f6a91085bd added async change email process 2015-11-03 14:16:57 +07:00
DNx5
4cbd8aad31 update ConsoleLogger 2015-11-03 14:08:51 +07:00
DNx5
e3166c6807 update management class 2015-11-03 12:52:07 +07:00
DNx5
ce432aa25a add exception to datasource method signature. 2015-11-03 12:38:24 +07:00
DNx5
1562cb7615 missed return statement. 2015-11-03 10:54:26 +07:00
DNx5
d73ac92ba3 sqlite max connection update. 2015-11-03 07:59:42 +07:00
DNx5
56aca7f473 this is enough. 2015-11-03 07:37:00 +07:00
DNx5
3ede8f0dae let bukkit load the chunk 2015-11-03 03:56:20 +07:00
DNx5
872856e729 create teleportTospawn method in Utils class 2015-11-03 03:42:02 +07:00
Tim Visée
6d46827936 Removed unused TODO 2015-11-02 20:20:59 +01:00
DNx5
6cc0cd62f5 move set join message outside task. 2015-11-03 02:01:24 +07:00
DNx5
f90104ca2d update player move event listener. 2015-11-03 01:53:01 +07:00
Tim Visée
9bcc210428 Updated developer in version command according to team.txt 2015-11-02 13:22:43 +01:00
Xephi
4fd8d6e0cd Don't use SuppressWarnings please :3 2015-11-02 10:25:53 +01:00
vanhec_a
2cd7bc8512 Check a boolean is a quickest way than check database :) 2015-11-02 10:16:01 +01:00
Gabriele C
5e7c5560cf Cleanup2: The Revenge 2015-11-02 00:09:40 +01:00
DNx5
da9cfc93d3 cleanup command pre process 2015-11-02 05:54:30 +07:00
Gabriele C
e60a5190f9 Fix conflict 
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
 2015-11-01 23:37:12 +01:00
Gabriele C
175da3f6fc Cleanup! 2015-11-01 23:35:10 +01:00
Gabriele C
3fc2bcde6d Merge pull request #61 from timvisee/master 
Moved Utils class to util package
 2015-11-01 23:31:26 +01:00
Tim Visée
3643afdea3 Moved Utils class to util package 2015-11-01 23:29:47 +01:00
Gabriele C
43327e9892 Merge pull request #60 from timvisee/master 
Added intelligent command manager and help system
 2015-11-01 23:24:53 +01:00
Tim Visée
0fbeefc488 Reverted javax mail implementation 2015-11-01 23:16:09 +01:00
Gabriele C
d401ad1dab I'm so stupid 2015-11-01 22:43:48 +01:00
Gabriele C
d69651026d Fix head rotation 2015-11-01 22:41:26 +01:00
Tim Visée
67a40a6fd0 Print a stack trace on STMP error 2015-11-01 22:38:27 +01:00
Tim Visée
6089d481a9 Collapsed catch block 2015-11-01 22:38:07 +01:00
Tim Visée
aae78fe9ef Fixed grammar 2015-11-01 22:37:48 +01:00
Tim Visée
5a6f6751a7 Changed r command to register 2015-11-01 22:27:31 +01:00
Tim Visée
386b80babc Moved a command configuration 2015-11-01 22:14:10 +01:00
Tim Visée
efeef0e1e9 Fixed default permissions 2015-11-01 22:12:09 +01:00
Tim Visée
a187bd61ca Removed unused import 2015-11-01 22:06:59 +01:00
Tim Visée
39c35fd342 Fixed invalid command references 2015-11-01 22:06:50 +01:00
Tim Visée
40fc2c893d Fixed captcha command dependency initializing too early 2015-11-01 21:49:47 +01:00
Tim Visée
ffd6d8e525 Fixed invalid command references 2015-11-01 21:46:13 +01:00
Tim Visée
dc0129d980 Implemented convert command 2015-11-01 21:44:13 +01:00
Tim Visée
bd6a95c3a8 Implemented the captcha command, fixed permissions for email commands 
Implemented the captcha command.
Fixed missing permission configurations for all email commands.
 2015-11-01 21:36:56 +01:00
Tim Visée
3e16866b23 Implemented the email recover command 2015-11-01 21:28:17 +01:00
Tim Visée
b10d3d3974 Implemented the email change command 2015-11-01 21:26:00 +01:00
Tim Visée
4c536a5204 Implemented the email add command 2015-11-01 21:20:08 +01:00
Tim Visée
7f63056cc9 Implemented the unregister command 2015-11-01 21:06:19 +01:00
Tim Visée
ebefca73b7 Implemented the logout command 2015-11-01 21:00:41 +01:00
Tim Visée
ebd25e16a0 Moved authme command 2015-11-01 20:57:33 +01:00
Tim Visée
a36553f75f Implemented the changepassword command 2015-11-01 20:57:13 +01:00
Tim Visée
5093e8ff78 Implemented the register command (2) 2015-11-01 20:51:16 +01:00
Tim Visée
ae76759dc0 Implemented the register command 2015-11-01 20:50:25 +01:00
Tim Visée
45fe939239 Improved Dutch language pack 2015-11-01 20:35:41 +01:00
Tim Visée
1fad2b401c Removed unused code 2015-11-01 20:17:52 +01:00
Tim Visée
f67cb02d23 Added help command for login 2015-11-01 20:16:35 +01:00
Tim Visée
67ad350754 Moved help command 2015-11-01 19:26:04 +01:00
Tim Visée
7700799e82 Forced the password parameter for login command 2015-11-01 19:19:50 +01:00
Tim Visée
bade9d5d5e Fixed invalid permissions for login command 2015-11-01 19:18:00 +01:00
Tim Visée
9d386ed80a Fixed invalid login command label 2015-11-01 19:15:56 +01:00
Tim Visée
6e222c1bc9 Implemented the login command 2015-11-01 19:13:55 +01:00
Tim Visée
0ca60299ad Some minor command description changes 2015-11-01 19:06:43 +01:00
Tim Visée
913ba56343 Implemented the base of the resetname command 2015-11-01 19:03:23 +01:00
Tim Visée
b4d710840d Removed some unused code 2015-11-01 18:58:41 +01:00
Tim Visée
443e9954af Moved some code around 2015-11-01 18:58:22 +01:00
Tim Visée
afd46edb39 Implemented the forcelogin command 2015-11-01 18:57:28 +01:00
Tim Visée
14eb8e28cf Implemented getip command 2015-11-01 18:54:03 +01:00
Tim Visée
c11ca35774 Improved the switchantibot command 2015-11-01 18:46:57 +01:00
Tim Visée
c4c54cd134 Fixed invalid command reference 2015-11-01 18:43:09 +01:00
Tim Visée
e3a6c73b58 Implemented the switchantibot command 2015-11-01 18:41:03 +01:00
Tim Visée
559072b3c6 Implemented the purgelastposition command 2015-11-01 18:35:40 +01:00
Tim Visée
e4d46ae9b9 Implemented the unregister command 2015-11-01 18:30:29 +01:00
Tim Visée
2d935d5fef Implemented the changepassword command 2015-11-01 18:27:25 +01:00
Tim Visée
8ead129423 Implemented the firstspawn command 2015-11-01 18:23:03 +01:00
Tim Visée
c9eef4f174 Implemented the spawn command 2015-11-01 18:19:36 +01:00
Tim Visée
4ff8cb8c59 Implemented the purgebannedplayers command 2015-11-01 18:17:13 +01:00
Tim Visée
17c103a7b2 Changed some command descriptions 2015-11-01 18:13:36 +01:00
Tim Visée
ff909d0c31 Implemented the setfirstspawn command 2015-11-01 18:12:15 +01:00
Tim Visée
79dd26da0f Implemented the setspawn command 2015-11-01 18:10:24 +01:00
Tim Visée
bc0f1b4bb9 Implemented the setmail command 2015-11-01 18:06:09 +01:00
Tim Visée
19f4af3e85 Implemented getemail command 
Various other improvements.
 2015-11-01 18:02:26 +01:00
Tim Visée
89c3c6ed5b Implemented register command 2015-11-01 17:56:10 +01:00
Tim Visée
93e9ef18d2 Organized executable commands package 2015-11-01 17:51:29 +01:00
Tim Visée
9e65eaa048 Implemented accounts command 2015-11-01 17:50:06 +01:00
Tim Visée
4ae5b0be1e Removed unused code 2015-11-01 17:44:34 +01:00
Tim Visée
1fd64bc065 Fixed issue, removed unused imports 2015-11-01 17:43:10 +01:00
Tim Visée
39d6fdd05d Implemented lastlogin command 2015-11-01 17:42:46 +01:00
Tim Visée
a2e33402f9 Fixed invalid command reference 2015-11-01 17:37:40 +01:00
Tim Visée
1a62cecd58 Implemented the purge command 2015-11-01 17:34:35 +01:00
Tim Visée
085f19355d Improved grammar in reload command 2015-11-01 17:31:22 +01:00
Tim Visée
d583a3f339 Improved reload command 2015-11-01 17:19:50 +01:00
Tim Visée
0781bc16d1 Implemented reload command 2015-11-01 17:12:50 +01:00
Tim Visée
40c7ef95e5 Added Profiler class 2015-11-01 17:08:23 +01:00
Tim Visée
c30792f278 Implemented version command 2015-11-01 17:06:36 +01:00
Tim Visée
53a2e8f9f0 Implemented plugin name in help page header 2015-11-01 16:59:07 +01:00
Tim Visée
2fcb5f1183 Added plugin name and version constants, implemented these 2015-11-01 16:58:13 +01:00
Tim Visée
7463d123e9 Disabled legacy /authme command 2015-11-01 16:54:42 +01:00
Tim Visée
2b8fdc65f0 Removed unused commands 2015-11-01 16:54:23 +01:00
Tim Visée
756469449e Updated command manager 2015-11-01 16:36:05 +01:00
Tim Visée
59d02e1497 Created base command for /authme 2015-11-01 16:34:36 +01:00
Tim Visée
2e5e3f25e3 Fixed imports of HelpCommand class 2015-11-01 16:34:13 +01:00
Tim Visée
802053f045 Removed unused service class 2015-11-01 16:21:24 +01:00
Tim Visée
7962d6b9fe Fixed CommandPermissions class 2015-11-01 16:19:56 +01:00
Tim Visée
c193120958 Fixed imports for CommandParts class 2015-11-01 16:18:29 +01:00
Tim Visée
a4461dd564 Ignore unused method 2015-11-01 16:17:57 +01:00
Tim Visée
5a0ffab6c2 Fixed import in CommandHandler class 2015-11-01 16:17:16 +01:00
Tim Visée
8b4d8a489c Fixed and improved CommandDescriptor class 2015-11-01 16:16:48 +01:00
Tim Visée
aff503c11c Fixed HelpProvider class 2015-11-01 16:13:49 +01:00
Tim Visée
690c7d9532 Added CommandHandler instance 2015-11-01 16:13:34 +01:00
Tim Visée
59d8ced86d Fixed imports of HelpSyntaxHelper class 2015-11-01 16:01:59 +01:00
Tim Visée
96d2208817 Fixed HelpPrinter class 2015-11-01 16:01:44 +01:00
Tim Visée
80e66198db Added list utilities class 2015-11-01 15:51:28 +01:00
Tim Visée
c156c988aa Improved string utils class, added javaDocs 2015-11-01 15:40:15 +01:00
Tim Visée
ab8eee3be9 Added string utilities class, fixed some imports 2015-11-01 15:38:49 +01:00
Tim Visée
eeec8ca228 Moved new command handler system to new package 2015-11-01 15:34:13 +01:00
Tim Visée
1897b1f5e6 Added dynamic command handler from Dungeon Maze 2015-11-01 15:31:15 +01:00
Gabriele C
7cea79eefc cleanup 2015-11-01 14:41:41 +01:00
Gabriele C
3eb29da4a7 Merge pull request #59 from Xephi/master 
Remove old loading chunk system
 2015-11-01 13:36:13 +01:00
vanhec_a
7824131cec Remove old loading chunk system 2015-11-01 13:34:21 +01:00
Gabriele C
d478973fa5 Enhance join/leave message delay 2015-11-01 13:23:47 +01:00
Gabriele C
b2bd3b0ab7 cleanup 2015-11-01 12:00:45 +01:00
Gabriele C
69b874c832 Update AuthMePlayerListener.java 2015-11-01 01:58:25 +01:00
vanhec_a
9629ad1594 Ooops, don't push test methods :') 2015-10-31 18:41:57 +01:00
vanhec_a
6007ffb8ef Add some entry to api 2015-10-31 18:40:31 +01:00
vanhec_a
f722fa161a Add a join blocker in case Cache Loading 2015-10-31 17:34:16 +01:00
Gabriele C
9aee483cc3 Fix compatibility issues with plugins like factionschat 2015-10-25 12:23:40 +01:00
Gabriele C
1306ef38b4 Merge pull request #56 from Xephi/master 
Up
 2015-10-23 17:18:21 +02:00
Xephi59
505bda79f0 Need to calcul position synchronously 2015-10-23 00:37:57 +02:00
DNx5
a2381fa025 1.7 compatibility 2015-10-23 00:23:12 +07:00
Gabriele C
38832fc2ce Fix conflicts 2015-10-20 22:05:19 +02:00
Xephi59
e1c1d18d05 Fix Player Online check 2015-10-19 23:37:42 +02:00
vanhec_a
a2f5a7917d Whoops ? :') 2015-10-16 17:03:34 +02:00
Gabriele C
c937338fc4 remove speed if player moves 2015-10-12 18:47:15 +02:00
Gabriele C
92777cd383 cleanup 2015-10-12 18:16:56 +02:00
Gabriele C
9c19f568fd fix conflict 2015-10-12 17:51:05 +02:00
vanhec_a
39ab41f542 Add an option to disable all caching (useful if you use website 
registration system)
 2015-10-12 15:49:19 +02:00
vanhec_a
5e991f7f42 realName here 2015-10-12 15:12:01 +02:00
vanhec_a
8e90a5f9a8 Force a player just registered by an admin to log again 2015-10-12 15:10:14 +02:00
vanhec_a
5b98759b61 Change how purge logged works at starting/stopping server 2015-10-12 15:01:57 +02:00
vanhec_a
3c0e6e06c7 Fix some case when connection is not available 2015-10-12 14:57:56 +02:00
vanhec_a
8ad2fde798 Remove REALLY old loading chunk system before teleport 2015-10-12 13:56:12 +02:00
Gabriele C
41bbbf0a96 custom graphs 2015-10-10 00:31:47 +02:00
Gabriele C
3567fc909d Organize imports 2015-10-09 19:18:24 +02:00
Gabriele C
a502a479b8 Fix compatibility 2015-10-06 21:04:06 +02:00
Gabriele C
807d302b60 1.5.2 compatibility 2015-10-06 19:17:03 +02:00
Gabriele C
aac4320f46 Fix build 2015-10-06 17:11:14 +02:00
Gabriele C
7aea267051 Fix conflict 2015-10-06 17:03:59 +02:00
vanhec_a
99fca1cb20 Fix Import 2015-10-06 12:32:12 +02:00
DNx5
4d4931af3f added reload function into module manager 2015-10-06 08:08:32 +07:00
DNx5
3f179ade81 rename inventory listener class 2015-10-06 07:11:51 +07:00
Xephi59
494281c365 Fix for older version of Bukkit 2015-10-06 01:11:24 +02:00
DNx5
157b028712 check the class is exist 2015-10-06 04:07:49 +07:00
DNx5
d7dfa3e4ac fill with air 2015-10-06 04:03:24 +07:00
Gabriele C
9c477c590c fix 1.7.10 compatibility issue 2015-10-05 22:57:33 +02:00
Gabriele C
de5ecfcb93 Fix compatibility issues 2015-10-05 22:28:31 +02:00
Gabriele C
4a22c916b1 cleanup 2015-10-04 14:37:06 +02:00
Gabriele C
5576b117c9 cleanup + moved legacy chestshop support 2015-10-04 14:33:21 +02:00
games647
8bda788a78 Improve performance by correct order of some checks. (i.e. check if the minor things before making a blocking call instead of reverse order) 2015-10-04 10:57:19 +02:00
Gabriele C.
06e098ab39 cleanup 2015-10-04 02:02:45 +02:00
Gabriele C.
c8b1318449 Update AuthMePlayerListener.java 2015-10-03 23:00:00 +02:00
games647
e9f299fca8 Fix PlayerAuth constructor calls 2015-10-03 18:22:13 +02:00
Gabriele C
4c2348e6e3 CleanUp (removed setinventory api method 2015-10-03 12:19:49 +02:00
games647
86ff20b6c9 Replacing old inventory protecting with safe packet modifications using ProtocolLib. 
Instead of clearing the inventory of players and storing it's contents in a file, we now prevent
the server from sending the inventory packet if the player is not logged in. The player will
see a empty inventory, but has still his items stored on the server. Therefore we don't
need to modify the player's inventory and we won't make any inventory corrupted.

Fixes Xephi/AuthMeReloaded#203,
Fixes Xephi/AuthMeReloaded#193,
Fixes Xephi/AuthMeReloaded#191,
Fixes Xephi/AuthMeReloaded#148

Remove dead code + Fix empty inventory on the unregister command

Fix NPE if ProtocolLib isn't enabled or installed
 2015-10-03 10:48:40 +02:00
DNx5
a013a6c54f update Settings 2015-10-03 13:01:44 +07:00
games647
34cc4ce78e Fix same nick kick if the name contains an upper case letter 2015-10-02 21:56:46 +02:00
Gabriele C
646eaad2ce cleanup 2015-09-28 21:35:06 +02:00
Gabriele C.
15d80665e8 Merge pull request #47 from games647/duplicateRegister 
Fix duplicate registers
 2015-09-28 20:14:18 +02:00
games647
47f0f0e927 Fix duplicate registers 2015-09-28 20:08:51 +02:00
Gabriele C.
d74dbeab97 Merge pull request #46 from lifehome/patch-1 
Patch 1
 2015-09-28 11:03:51 +02:00
Ivan Ip
b61db5c569 Simplified and updated strings. 
Modified some translation and proofread grammars, for players' easy-understanding. Also corrected some typo on color scheme.
 2015-09-28 16:34:07 +08:00
DNx5
72604bfdea improve cached datasource performance. 2015-09-25 07:20:46 +07:00
DNx5
f88e197863 cleanup Settings 2015-09-25 05:21:32 +07:00
DNx5
45d939f0f5 init field first, fix #221 2015-09-25 01:06:58 +07:00
DNx5
8b71f964da fix changepassword issue. #190 #218 2015-09-24 18:30:24 +07:00
Gabriele C
8f446fa6af Fix settings (i hope) 2015-09-23 22:10:11 +02:00
DNx5
53f3ad114b re-add geoip methods and set as deprecated 2015-09-24 00:55:01 +07:00
DNx5
10580e3447 cleanup converters 2015-09-23 21:50:17 +07:00
DNx5
fec4fb2913 projectile issue 2015-09-23 17:55:56 +07:00
DNx5
837da9a0fa disabling protectInventory should be okay now 2015-09-21 01:16:04 +07:00
DNx5
dfe1074f65 revert fixdurability task. not necessary 2015-09-21 00:45:37 +07:00
DNx5
365e23d863 show the name, not displayname 2015-09-21 00:44:40 +07:00
DNx5
490f9406c3 added durability fix 2015-09-21 00:15:05 +07:00
DNx5
b9dce03af5 add ProjectileLaunch listener. 2015-09-20 23:17:03 +07:00
DNx5
accd209e84 add null check for vehicle 2015-09-20 22:58:54 +07:00
DNx5
5247b5aa2c fix cache folder not removed 2015-09-20 22:55:44 +07:00
Gabriele C
4b67cf961c fix speed remover 2015-09-20 17:21:49 +02:00
DNx5
878ab70c2f move GeoIP function into Utils 2015-09-20 21:50:39 +07:00
DNx5
2cea7387c9 set all listeners to use checkAuth method. 2015-09-20 21:25:29 +07:00
DNx
14f187c32d start working on modules 2015-09-20 20:17:40 +07:00
DNx5
c94f9c5cdc update to use the new vault API 2015-09-20 20:17:37 +07:00
DNx5
b27079026b use guava's bytestream 2015-09-20 20:17:35 +07:00
Gabriele C
d826777701 remove speed option + config description enhancements 2015-09-20 13:41:06 +02:00
Gabriele C
23e16bb717 Fix fly speed 2015-09-20 12:08:24 +02:00
DNx5
ec1e0527ec sneaky plugin message 2015-09-20 15:58:16 +07:00
DNx5
297e41e9bd cleanup 2015-09-20 15:54:37 +07:00
DNx5
6babac98eb extract auth check into a method. 2015-09-20 15:53:18 +07:00
DNx5
ff1cc8c27d not needed, it does the same thing if event is cancelled 2015-09-20 14:54:49 +07:00
DNx5
314fb01105 store isAuthAvailable into local variable. 
improve performance when cache is not enabled.
 2015-09-20 14:46:03 +07:00
DNx5
22638c29e5 update logger 2015-09-20 14:26:46 +07:00
DNx5
4e275eeb1d change Utils to static class. 2015-09-20 14:11:17 +07:00
DNx5
e1893ce85b ups, forgot to put inventory. 2015-09-20 11:42:41 +07:00
DNx5
4288fa29b6 update 2015-09-20 09:26:29 +07:00
DNx5
b1276da416 protect inventory only for registered player 2015-09-20 09:18:30 +07:00
DNx5
350ab53563 update base64 2015-09-20 08:44:30 +07:00
DNx5
53fcfb5b43 cleanup encryption 2015-09-20 08:44:28 +07:00
Gabriele C
b427d14bcb Speed 0 when not logged! 2015-09-19 22:28:55 +02:00
Gabriele C
dc35d768aa add max connections setting 2015-09-19 20:20:46 +02:00
DNx
0f631d34d3 Merge pull request #45 from Xephi/master 
Fix bad async call
 2015-09-19 14:13:42 +07:00
DNx5
4ec548cb8d added null check, #209 #210 2015-09-19 13:27:31 +07:00
DNx5
a00deb0e0f unregister asynchronously 2015-09-19 12:51:59 +07:00
DNx5
b5546c07b4 cleanup string concatenates 2015-09-16 11:37:18 +07:00
DNx5
51067498ea cleanup MySQL throws 2015-09-16 11:36:08 +07:00
DNx5
6a8e581ba8 added softdepend for PerWorldInventories 2015-09-16 11:20:43 +07:00
Gabriele C
f63fe5bc37 Enhance combattag hook 2015-09-15 21:11:56 +02:00
Gabriele C
5fb3542cea useledd imports 2015-09-15 19:37:59 +02:00
Gabriele C
4fca6108d9 cleanup 2015-09-15 19:07:41 +02:00
DNx5
cdfdc06312 revert logger 2015-09-15 23:37:33 +07:00
DNx5
1de2705840 remove constant check 2015-09-15 23:20:26 +07:00
Gabriele C
b62e527b40 useless stuff 2015-09-15 18:15:26 +02:00
DNx5
f2e207dab1 change structure of ModuleManager 2015-09-15 23:11:45 +07:00
DNx5
24c7efbd94 update loadResource method 2015-09-15 23:10:52 +07:00
DNx5
221b32744c fix string concatenates performance 2015-09-15 22:44:40 +07:00
Gabriele C
026d84427b General npc support, fixes and enhancements 2015-09-15 16:33:32 +02:00
DNx5
c473e81eb9 same fix for normal sqlite 2015-09-15 16:31:07 +07:00
DNx5
6f22aa779b sqlite fix, load AuthMe faster. 2015-09-15 16:23:56 +07:00
DNx5
c82aaa303d cleanup MySQL code. 2015-09-15 15:40:19 +07:00
DNx5
f975fefd4a run saveAuth async in CacheDataSource 2015-09-15 15:39:45 +07:00
DNx5
3996c8cfca this should not cause lag anymore if database cache is enabled. 2015-09-15 15:03:00 +07:00
DNx5
3620b712b7 improve DatabaseCalls, 2015-09-15 14:38:55 +07:00
DNx5
91d6ead466 update ConsoleLogger 2015-09-15 14:34:07 +07:00
DNx5
e1b2a1852c update ConsoleLogger 2015-09-15 14:33:23 +07:00
DNx5
232f332be2 revert, bad file encoding. 2015-09-15 13:43:39 +07:00
DNx5
7add63869e no need to rewrite language file. fix #206 2015-09-15 00:02:52 +07:00
DNx5
e9cf5de663 added ID messages translation. 2015-09-14 23:39:53 +07:00
DNx5
b8abe71584 remove message 'bad_database_email' 2015-09-14 23:35:31 +07:00
DNx5
0b23074770 changed settings load method. 2015-09-14 20:46:56 +07:00
DNx5
7c56dec476 change all usage of getOnlinePlayers 2015-09-14 19:50:32 +07:00
DNx5
0768642e85 cleanup Settings 2015-09-14 18:58:37 +07:00
Gabriele C
550cffcc42 cleanup 2015-09-14 12:34:52 +02:00
DNx5
981da0a0f3 extract language if available. 2015-09-14 09:26:52 +07:00
DNx5
670caaea4b fix resource extracting. 2015-09-14 08:23:02 +07:00
DNx5
9736e4c207 init instance at the top, to avoid problems. 2015-09-14 04:32:12 +07:00
DNx5
2fe9e735a1 init playerBackup field on enable. 2015-09-14 04:21:38 +07:00
DNx5
a4fd60a6f6 fix cache, still not add null check. 2015-09-14 03:45:09 +07:00
DNx5
b4124bc46d cleanup Listeners. 2015-09-14 01:42:31 +07:00
DNx5
f60604c86c run admin register task async. 2015-09-14 01:22:23 +07:00
Gabriele C
e11a1e9b09 damn 2015-09-13 20:03:28 +02:00
Gabriele C
c0e75dbbd2 fix tabulation 2015-09-13 20:01:55 +02:00
Gabriele C
b1b441fac2 cleanup 2015-09-13 19:58:54 +02:00
DNx5
355c04c361 prevent eating food 2015-09-14 00:19:37 +07:00
DNx5
7458224ada Enhance mainclass 2015-09-13 23:41:28 +07:00
DNx5
e85d8acc24 refactor, 2015-09-13 22:40:19 +07:00
DNx5
b0fc123229 replace cache with Json 2015-09-13 22:10:41 +07:00
DNx5
cb59f44b9b Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
 2015-09-13 22:09:12 +07:00
DNx5
576ff59fcd replace cache with Json 2015-09-13 22:08:18 +07:00
Gabriele C
f297609818 cleanup 2015-09-13 17:07:07 +02:00
DNx5
851eab2fd0 cleanup Utils.java 2015-09-13 21:57:36 +07:00
Gabriele C
680717dbca Fix 2015-09-13 16:28:47 +02:00
Gabriele C
3cbc7ab18f should fix item usage issue 2015-09-13 15:18:22 +02:00
Gabriele C
76b4f62e79 cleanup 2015-09-13 15:01:22 +02:00
Gabriele C
d8c2a25116 Working sqlitehikari! ;D 2015-09-13 12:25:12 +02:00
Gabriele C.
b2234b1e0d Merge pull request #44 from DmitryRendov/team 
Fixed PBKDF2DJANGO hash map
 2015-09-13 12:12:51 +02:00
DmitryRendov
023e64c8d5 Fixed PBKDF2DJANGO hash map 2015-09-13 09:59:30 +00:00
Gabriele C.
c485a58036 Update MySQL.java 2015-09-12 11:53:30 +02:00
Gabriele C
d4cf739081 Fix hikari 2015-09-10 19:56:33 +02:00
Gabriele C.
639a0482c2 Merge pull request #43 from DNx5/master 
improve inventory cache method  (EXPERIMENTAL)
 2015-09-10 12:11:10 +02:00
DNx5
08d72785b4 improve inventory cache method 2015-09-10 13:29:11 +07:00
Gabriele C
08c77b6483 Cleanup 2015-09-09 20:21:45 +02:00
Gabriele C.
0180b2210c Merge pull request #42 from DNx5/master 
cleanup & improvements
 2015-09-08 20:49:29 +02:00
DNx5
afeb359b73 cleanup & improvements 2015-09-09 01:28:27 +07:00
Gabriele C
46002b95e3 Cleanup 2015-09-08 18:12:31 +02:00
Gabriele C
c1d56d5ee5 Fix hikari for mysql and sqlite 2015-09-08 17:33:52 +02:00
Gabriele C.
e2b3c51cab Update MySQL.java 2015-09-08 16:49:47 +02:00
vanhec_a
cbca79f1a4 Fix bad async call 2015-09-08 11:43:32 +02:00
Gabriele C
c0eb15ee49 Cleanup 2015-09-07 20:38:29 +02:00
DNx5
90c7187bab run task async, fix #200 2015-09-07 23:28:15 +07:00
DNx5
5a9c6278b6 Merge branch 'master' of git://github.com/AuthMe-Team/AuthMeReloaded into AuthMe-Team-master 
Conflicts:
	src/main/java/fr/xephi/authme/datasource/MySQL.java
 2015-09-07 20:49:10 +07:00
Gabriele C
65bb488f4c PBKDF2DJANGO Hash 2015-09-07 14:30:56 +02:00
Gabriele C
7d8ef95a22 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded 2015-09-07 14:06:29 +02:00
Gabriele C
84b5dcc625 Cleanup 2015-09-07 14:05:50 +02:00
Gabriele C.
8ec497a5e8 Update AuthMe.java 2015-09-07 13:25:40 +02:00
Gabriele C.
284909a215 Merge pull request #39 from Xephi/master 
Up
 2015-09-07 13:23:18 +02:00
Alexandre Vanhecke
1e9d7f879a Sponsor 2015-09-07 12:35:49 +02:00
Gabriele C.
3032608f6a Merge pull request #38 from DmitryRendov/master 
Hash update
 2015-09-06 23:59:03 +02:00
DmitryRendov
7c2649abf5 Fix 2015-09-06 20:32:58 +00:00
DmitryRendov
495dd35b48 Updated PBKDF2 hasher to support Django 1.7+ 2015-09-06 20:28:25 +00:00
DNx5
200ff01cd9 never return null, just throw exception. 2015-09-06 22:24:23 +07:00
Gabriele C
3926faeb35 Fix Hikari timeouts 2015-09-06 13:51:35 +02:00
Gabriele C
1f66a7474d Stuff! + HikariCP Log4J 2015-09-05 00:45:48 +02:00
Gabriele C
63889c030a fix conflict 2015-08-28 23:21:22 +02:00
Xephi59
3bcaa3f12b Change to minimum lifeTime 2015-08-28 00:16:49 +02:00
Xephi59
e33ebb7379 Change some custom event to let them be async 2015-08-28 00:16:26 +02:00
Xephi59
eec7a7f575 Add SALTEDSHA512 Encryption 2015-08-27 23:28:12 +02:00
Gabriele C
7c9298f096 More unstuble stuff! (Now it compiles) 2015-08-27 00:21:53 +01:00
Gabriele C
568784a8e1 test new mysql (not working yet) 2015-08-26 22:52:23 +01:00
Gabriele C
fd063b17e2 fix conflict 2015-08-26 22:43:07 +01:00
Xephi59
3ce87f1710 Fix 2015-08-26 19:01:39 +02:00
Xephi59
fa6e048c21 Fix DriverClassName not properly set 2015-08-26 18:55:33 +02:00
Gabriele C.
c61568e900 Merge pull request #33 from Xephi/master 
Up
 2015-08-22 16:35:07 +02:00
Gabriele C
217c217d13 Stuff 2015-08-22 16:34:06 +02:00
Xephi59
c7a711d0b2 Add Try/catch to DataSource close 2015-08-22 15:30:17 +02:00
Gabriele C
c12e24d0f8 Added stacktraces to find out what's the problem -_- 2015-08-21 23:35:44 +02:00
Xephi59
cd0659ac89 ahah copy/paste spotted :D 2015-08-20 23:30:31 +02:00
Xephi59
e1eb22239a Add Third Party PreLogin Event 2015-08-20 23:29:02 +02:00
Xephi59
86e1b8df7c Define a max life time of a pool 2015-08-20 18:59:41 +02:00
Xephi59
b84d96360e TEMP FIX - Catch all Exception instance due to HikariCP thrown 2015-08-20 18:49:22 +02:00
Xephi59
9d950b9b4a Potential NPE 2015-08-20 18:39:40 +02:00
Gabriele C
c88bad08c0 added nullcheck 2015-08-15 21:10:36 +02:00
Gabriele C
8c8f84ae4a Some fixes! 
Thanks to Koolaid5000 for the forcesinglesession fix idea! 👍
 2015-08-15 19:52:33 +02:00
Alexandre Vanhecke
1ad4865911 Need to get the old value 2015-08-14 12:32:04 +02:00
Gabriele C
b982ff3c95 Deprecated the chestshop hook 2015-08-13 19:25:00 +02:00
Xephi59
455864d14d Fix NPE 2015-08-12 21:04:04 +02:00
Xephi59
5c059bdd43 Move from Join to Login 2015-08-10 23:15:29 +02:00