Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-10-31 15:49:56 +01:00
Code Issues Projects Releases Wiki Activity
968 Commits 47 Branches 8 Tags 102 MiB
4ae5b0be1e
Commit Graph

633 Commits

Author SHA1 Message Date
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
Xephi59
11db85ac26 Fix LowerCase/Session Stolen issue 2015-08-10 22:56:07 +02:00
Xephi59
253b54da1d Messages can now be customized more easily 2015-08-10 00:06:55 +02:00
Gabriele C.
20c75f1980 Update AdminCommand.java 2015-08-04 15:18:45 +02:00
Gabriele C.
52b48f71c4 Update AuthMe.java 2015-08-04 15:16:59 +02:00
Gabriele C.
fc97c60529 Update plugin.yml 2015-08-03 19:18:30 +02:00
Gabriele C.
8122a3bf1e Merge pull request #28 from Xephi/master 
update realName
 2015-08-03 18:44:43 +02:00
Xephi59
c1ffe47468 update realName 2015-08-03 18:37:42 +02:00
Gabriele C.
70da194aad Merge pull request #27 from Xephi/master 
Up
 2015-08-03 18:35:45 +02:00
Xephi59
50b41effa6 Fix conversion issue with lower case 2015-08-03 18:24:20 +02:00
Xephi59
f019be4833 little fix 2015-08-03 18:22:52 +02:00
Gabriele C
acbae36ddf Spaces in pom + optimizations 2015-08-02 14:22:34 +02:00
Xephi59
d10e5b081b Omfg ... 2015-08-02 01:14:39 +02:00
Xephi59
9be5d3518f Flatfile don't support lowercase 2015-08-02 00:56:50 +02:00
Xephi59
fa7c8be10f Try to fix lowercase issue 2015-08-02 00:40:00 +02:00
Xephi59
0c20101947 Bcrypt only support $2a previously 2015-08-01 03:03:54 +02:00
Xephi59
30564fad6e nice fail 2015-08-01 02:57:25 +02:00
Gabriele C
62e3bc4f11 Fixed non closed reader 2015-08-01 01:06:42 +02:00
Gabriele C
72f0f65bed added perworlditems check 2015-08-01 01:05:05 +02:00
Gabriele C
945b24990a fixed cp property 2015-07-31 16:26:54 +02:00
Xephi59
5ed134b172 Fix SaveQuitLoc, idk why spigot handle quit player as dead player 2015-07-31 14:55:47 +02:00
Xephi59
4ecbd7b526 Try this way to fix quitloc 2015-07-31 14:39:49 +02:00
Xephi59
84a1227afd Handle misconnection 2015-07-31 14:32:28 +02:00
Xephi59
8b9f0ec882 Custom name to pool 2015-07-31 14:22:07 +02:00
Xephi59
6b53afa731 Add failfast and reconnexion 2015-07-31 14:07:14 +02:00
Xephi59
d49b309301 Change the MySQL Connection Pool to HikariCP, so fast ! 2015-07-31 03:31:17 +02:00
Xephi59
60fc76981c Merge branch 'master' of https://github.com/Xephi/AuthMeReloaded 2015-07-31 01:57:50 +02:00
Xephi59
1cc1311323 little fix to lowercase issue 2015-07-31 01:57:40 +02:00
Gabriele C.
42dc6e3a42 Merge pull request #19 from Xephi/master 
Up
 2015-07-31 01:36:44 +02:00
Xephi59
e889fb580a We don't need to old it, already done in the hash 2015-07-31 01:12:20 +02:00
Xephi59
fa831700a2 Add bcrypt_2y for new phpbb system 2015-07-31 01:11:34 +02:00
Gabriele C.
4568b11664 Merge pull request #18 from Xephi/master 
Up
 2015-07-31 01:05:15 +02:00
Xephi59
9c42be39d8 meta 2015-07-31 00:23:30 +02:00
Xephi59
8bd6618481 Deprecate this 2015-07-31 00:14:39 +02:00
Gabriele C
fc09fb3a5c Updated plugin.yml 2015-07-30 23:54:19 +02:00
Gabriele C
7bfab781a1 More error messages! 2015-07-30 00:47:19 +02:00
Gabriele C
b8a2240982 Add error message if unable to generate img 2015-07-29 18:44:06 +02:00
Gabriele C
a06f3de35a Fixed autopurge with UUIDS 2015-07-29 14:49:14 +02:00
Gabriele C
79759bf139 Removed Passpartu feature 2015-07-29 14:12:22 +02:00
Gabriele C
b0d9fdc978 code style 2015-07-28 18:36:12 +02:00
Gabriele C
88530542ac Fixes 2015-07-28 17:06:54 +02:00
Gabriele C
47211ab803 Code cleanup 2015-07-28 02:57:50 +02:00
Gabriele C
223fff4b52 New attempt to fix the broken email registration -_- 2015-07-28 02:11:58 +02:00
Gabriele C
c4f516582c Ok, go away stupid checks! 2015-07-28 01:39:58 +02:00
Gabriele C
f80017de67 Fixed xD 2015-07-28 01:26:04 +02:00
Gabriele C
90d8fc8548 Second attempt to fix email registration 2015-07-28 01:15:00 +02:00
Gabriele C
79e6574232 Separate message for antibot kick 2015-07-28 00:40:25 +02:00
Gabriele C
5388f08117 Allow session timeout = 0 (with warnings) 2015-07-28 00:04:16 +02:00
Gabriele C
ba06bb514a Revert "First attempt to fix the email registation issue" 
This reverts commit cd3e7b5d43.
 2015-07-27 16:09:06 +02:00
Gabriele C
cd3e7b5d43 First attempt to fix the email registation issue 2015-07-27 15:08:40 +02:00
Xephi59
d0e1d7b8b8 Change how config work for the first launch 2015-07-26 00:50:21 +02:00
Xephi59
c51b131a54 Concurrent shit 2015-07-25 04:28:37 +02:00
Gabriele C
a7a4a511e7 Hotfix: it was shit, sorry 2015-07-25 00:08:29 +02:00
Gabriele C
a614d3e554 Removed performance section 2015-07-24 23:31:17 +02:00
Gabriele C.
ed371e4ac7 Update Settings.java 2015-07-24 22:35:38 +02:00
Gabriele C.
b150589080 Update messages_uk.yml 2015-07-24 09:22:08 +02:00
Gabriele C.
094f454cf2 Update messages_ru.yml 2015-07-24 09:21:17 +02:00
Gabriele C.
6189e63e31 Merge pull request #15 from Bodyash/master 
Ukrainian Translation Update
 2015-07-24 09:20:03 +02:00
Bodyash
350366c66e Ukrainian Translation Update 2015-07-24 05:53:17 +03:00
Alexandre Vanhecke
98302e8325 Merge pull request #144 from AuthMe-Team/master 
Update DE Translation
 2015-07-24 04:18:27 +02:00
Bodyash
9fa3b02b4c Russian Fix #2 (sorry for the first commit) 2015-07-24 05:09:14 +03:00
Bodyash
fe0be37d0a Updated Russian Language 
Some Fixes
 2015-07-24 04:55:20 +03:00
irobin591
0de80f5b4b Update de translation 2015-07-23 22:09:52 +02:00
Xephi59
353b0749b9 Remove useless fields 2015-07-23 17:21:49 +02:00
Gabriele C.
759bc8221e Merge pull request #11 from Xephi/master 
Up
 2015-07-23 16:41:34 +02:00
Xephi59
4c2fad3643 Fix LowerCase issue 2015-07-23 16:23:25 +02:00
Xephi59
a9dcf15759 Remove PlayerLogs, so buggy 2015-07-23 13:06:56 +02:00
Xephi59
bcd31c5844 Change how SQLite store logged 2015-07-23 13:01:47 +02:00
Xephi59
38f4cb0231 Push a model for module type - DEV 2015-07-22 21:47:08 +02:00
Xephi59
b956f28fc0 Maybe an NPE ? :/ 2015-07-22 21:45:53 +02:00
Gabriele C
c133b790ae Updated zhhk translation 
Thanks to @WaterXCubic
 2015-07-22 10:13:51 +02:00
Xephi59
4ecfffd8cf English Syntax #2 2015-07-22 02:04:43 +02:00
Xephi59
ef5a2462bc English syntax 2015-07-22 02:03:10 +02:00
Xephi59
f0eed86155 Deprecated this method, V2 of verygames already include this 2015-07-21 17:32:53 +02:00
Xephi59
8b48e936fb Use our own thread 2015-07-21 01:17:24 +02:00
Xephi59
03bfe80ee2 Set SQLite as default database and convert actual flat to sqlite 2015-07-21 01:13:27 +02:00
Gabriele C
684abf97c8 Code cleanup 2015-07-20 09:59:53 +02:00
Xephi59
a89c5c7668 Merge branch 'master' of https://github.com/Xephi/AuthMeReloaded 2015-07-20 02:41:25 +02:00
Xephi59
480db6816f Synax 2015-07-20 02:41:14 +02:00
Maxetto
1760461518 Update Settings.java 
Returning the method if file is NOT found.
 2015-07-19 01:37:22 +02:00
Maxetto
ea7b470c31 Update Messages.java 
Returning the method if file is NOT found.
 2015-07-19 01:36:36 +02:00
Gabriele C
1bde8729ee I hope I didn't made only shit (pls check this) 2015-07-18 21:57:26 +02:00
Gabriele C.
edd77fe0a6 Update messages_de.yml 2015-07-18 20:27:35 +02:00
Gabriele C.
db15afbab7 Merge pull request #7 from Trojaner25/patch-2 
Update german translation (add missing translations)
 2015-07-18 20:25:04 +02:00
Gabriele C.
aae94a29b8 Merge pull request #6 from Xephi/master 
Encoding depend on OS
 2015-07-18 17:02:18 +02:00
Xephi59
663c4a48d1 Encoding depend on OS 2015-07-18 16:52:14 +02:00
Trojaner
d433b7d0f8 Update german translation (add missing translations) 2015-07-18 16:54:14 +03:00
Gabriele C.
32063bc760 Update messages_en.yml 2015-07-18 15:02:23 +02:00
Maxetto
8906738ca9 Update messages_en.yml 
- unknown_user casts when no record is found in the database, therefore hasn't even connected to the server.
- pl(e)ase
- user_reddeg casts when trying to register after having already registered the name. We must then use it at 2nd person.
- I personally didn't like the new "password_error"
 2015-07-18 14:51:13 +02:00
Gabriele C.
6966fa4faa Update messages_en.yml 2015-07-18 14:33:44 +02:00
Gabriele C
ebacf5e164 No colors! 2015-07-18 00:02:48 +02:00
Xephi59
b60daae936 Sync this 2015-07-17 20:35:01 +02:00
Gabriele C
c3c90e8d76 Fixed ZHTW translation 2015-07-16 21:37:00 +02:00
Gabriele C
02843b6a6d Fixed logger 2015-07-16 21:27:28 +02:00
Gabriele C
5f5c1b19f0 Enhanced console messages 2015-07-16 21:16:58 +02:00
Xephi59
bf8ad3f1d6 Forgot this too 2015-07-15 18:30:10 +02:00
Xephi59
8037da0fa8 forgot to remove that 2015-07-15 18:29:25 +02:00
Xephi59
e9308bb231 Fix Inventory Loss + Timeout timings 2015-07-15 18:21:06 +02:00
Xephi59
0fbf57cf1a Don't Wait ! 2015-07-15 18:05:17 +02:00
Gabriele C.
da5248c547 Update messages_zhtw.yml 2015-07-14 14:11:26 +02:00
Gabriele C.
cd3dbb5a2a Update config.yml 2015-07-14 14:06:42 +02:00
Gabriele C.
b9d648f97a Incrase default security level 2015-07-14 11:46:43 +02:00
Gabriele C.
9de8c95fd0 Update messages_en.yml 2015-07-14 11:33:46 +02:00
Gabriele C
052731fbd3 Fixed format type 2015-07-14 09:19:19 +02:00
Gabriele C
9c4b1cd699 Updated zhtw translation 2015-07-14 09:14:57 +02:00
Xephi59
3fe1c4edae Fix NPE 2015-07-14 05:05:16 +02:00
Xephi59
7f7b713e67 Send mail as html 2015-07-14 04:34:31 +02:00
Xephi59
83b1055df0 Try to restore inventory after register 2015-07-14 04:17:21 +02:00
Xephi59
c3f314c491 Compilation issues 2015-07-13 18:54:45 +02:00
Xephi59
869b89adac Re-Add old API to prevent some plugin break 2015-07-13 06:07:48 +02:00
Xephi59
5660ccc300 Fix FileCache ... Sleeping is stupid x) 2015-07-13 01:15:18 +02:00
Xephi59
08292b8ac1 Change to StringList 2015-07-12 23:14:21 +02:00
Xephi59
0ce07ad4b4 NPE ? :O 2015-07-12 22:39:14 +02:00
Xephi59
f41b18c66f Fix Compilation issue 2015-07-12 22:22:49 +02:00
Gabriele C
31c8afb98a Unused stuff! 2015-07-12 21:01:48 +02:00
Gabriele C
fd28286ced Unused stuff? 2015-07-12 15:42:40 +02:00
Maxetto
d4c37b2fc2 Coding without Eclipse is hard! 
But that should do the trick.
 2015-07-10 23:03:09 +02:00
Maxetto
e8a6ce6e75 Compilation Fixes 2015-07-10 22:59:01 +02:00
Maxetto
34c15a5746 Revert sgdc3 fix here. 2015-07-10 22:44:14 +02:00
Gabriele C
b87768478d fixed conflict 2015-07-10 22:28:43 +02:00
Maxetto
ffab80188f Remember to sync before pushing! 2015-07-10 17:06:13 +02:00
Maxetto
aa871e2dcf Remember to sync before pushing! 2015-07-10 17:04:03 +02:00
Maxetto
91a4afb41f Remember to sync before pushing! 2015-07-10 17:02:57 +02:00