Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-08 11:40:58 +01:00
Code Issues Projects Releases Wiki Activity
996 Commits 47 Branches 8 Tags 102 MiB
67ad350754
Commit Graph

662 Commits

Author SHA1 Message Date
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