Commit Graph

1750 Commits

Author SHA1 Message Date
ljacqu
644f7e8541 Merge origin/enum into local branch 2015-11-25 22:18:21 +01:00
Lucas Jacques
5f9ba208de Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into enums 2015-11-25 19:52:15 +01:00
Lucas Jacques
55bfceca31 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into enums
Conflicts:
	src/main/java/fr/xephi/authme/AntiBot.java
	src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
2015-11-25 19:51:34 +01:00
DNx5
7767ae6c0e revert to boolean 2015-11-26 01:43:27 +07:00
Lucas Jacques
37a615fa03 Create test that AntiBot is not enabled if Settings disable it 2015-11-25 19:39:16 +01:00
Gabriele C
ae3cf02c06 fix new version of hikari 2015-11-25 18:27:03 +01:00
Gabriele C
0abec89d1c Update hikari library 2015-11-25 18:20:18 +01:00
Gabriele C
939462786f other parameters 2015-11-25 18:18:23 +01:00
Gabriele C
c3ed771939 WIP new hikari parameters 2015-11-25 17:06:00 +01:00
Gabriele C
f6e9347e1e cleanup 2015-11-25 15:39:15 +01:00
Gabriele C
6dc4119d0c cleanup 2015-11-25 15:37:06 +01:00
Gabriele C
ea0e65df55 continue 2015-11-25 15:13:45 +01:00
Gabriele C
f8ec474534 start fixing language 2015-11-25 15:11:01 +01:00
Gabriele C
32e088c73f fix maven import issue 2015-11-25 13:15:04 +01:00
Tim Visée
d7328466b8 Improved and updated the custom configuration class 2015-11-25 01:32:11 +01:00
Tim Visée
2c2dd8e0d5 Disabled NPC check in player quit event 2015-11-25 01:13:06 +01:00
ljacqu
0065a6a827 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into enums 2015-11-24 23:32:54 +01:00
ljacqu
d2b3d416a9 Change calls to Messages to use the MessageKey enum 2015-11-24 23:27:28 +01:00
Gabriele C
2c0d140da9 Try to fix NPC issues 2015-11-24 23:23:51 +01:00
ljacqu
cb11ae9610 Deprecate Messages#send(String) in favor of the MessageKey enum 2015-11-24 23:11:14 +01:00
DNx
be1eb9392a ugh 2015-11-25 05:10:13 +07:00
DNx
da390530e9 Update AuthMePlayerListener.java 2015-11-25 05:05:41 +07:00
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
Bogdan
eed4fa4266 Merge remote-tracking branch 'refs/remotes/Xephi/master' 2015-11-24 10:32:08 +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