Commit Graph

692 Commits

Author SHA1 Message Date
Gary Tierney ef740b36e0 Fix short circuit logic in ItemDefinitionDecoder
* Replaces an OR, with what should have been an AND while decoding
  unused item definition info.
2015-12-21 04:03:26 +00:00
Major 442ac44a08 Merge pull request #104 from garyttierney/bugfix/catch-decoder-errors
Handle errors thrown by SynchronousDecoder tasks
2015-10-05 13:29:40 +01:00
Gary Tierney 2ee5a7cf7b Call executor.shutdown() to run tasks 2015-10-03 23:31:29 +01:00
Gary Tierney 9abed472e9 Handle errors thrown by SynchronousDecoder tasks
Check for errors thrown execution of any SynchronousDecoder tasks, and
rethrow any ExecutionExceptions as SynchronousDecoderExceptions.
2015-10-03 23:20:05 +01:00
Major bea652589b Merge pull request #101 from garyttierney/enhancement/dot-editorconfig
Add .editorconfig file to override IDE defaults
2015-09-21 21:48:19 +01:00
Gary Tierney e9c33534a6 Add .editorconfig file to override IDE defaults
Add rules for enforcing tabs in Java, and spaces in Ruby.

Add a rule to make sure trailing whitespace is trimmed
and that no new final newline is inserted.
2015-09-19 15:18:14 +01:00
Major 9343246d60 Merge pull request #99 from garyttierney/feature/message-handler-testing
Add simple tests for 'important' Message verification handlers.
2015-09-14 12:06:47 +01:00
Gary Tierney 80be2691ca Remove ItemVerificationHandler test to account for #32 2015-09-13 16:06:20 +01:00
Gary Tierney c65d533288 Add tests around ItemOnObjectVerificationHandler
Add various tests around ItemOnObject messages to verify that a valid
object needs to be given as well as a valid item in order for the
message to be passed down the MessageHandlerChain.
2015-09-13 02:20:37 +01:00
Gary Tierney 15f5d4a36e Change @BeforeClass to @Before to prevent tests failing 2015-09-13 01:46:59 +01:00
Gary Tierney a21b6581d6 Move powermock to bottom of pom, change junit scope to test 2015-09-13 01:46:41 +01:00
Gary Tierney 0c074bd123 Add tests around ObjectActionVerificationHandler
Add a test which verifies an ObjectActionMessage is terminated if its
not within the specified distance of the player.

Additionally add a test which verifies that an ObjectActionMessage is
terminated if there is no object with the given id nearby.
2015-09-13 01:42:12 +01:00
Gary Tierney ef398dc098 Add a test around ChatMessageHandler, update imports
Update the previous ItemOnItemVerificationHandler test to use static
imports of PowerMockito and Assert.
2015-09-13 01:25:00 +01:00
Gary Tierney 82801df436 Add a test around the target of ItemOnItemMessage
Check that the message is terminated() if an ItemOnItemMessage
is received with an invalid target item.
2015-09-13 01:17:41 +01:00
Gary Tierney c9b702bcfb Get ItemOnItemVerificationHandlerTest passing 2015-09-13 01:14:04 +01:00
Gary Tierney a5f8b1f9fd Test messages with an invalid source are terminated 2015-09-13 01:08:11 +01:00
Gary Tierney 7dc45c0281 Add PowerMock JUnit module and Mockito API to pom 2015-09-13 01:07:19 +01:00
Major 22c72ef35c Merge pull request #95 from lare96/master
Addban and mute support.
2015-09-02 19:27:18 +01:00
lare96 c3ebfb46a8 Ban and mute support, commands included. 2015-09-02 14:17:48 -04:00
Major- 5376b08161 Fix issue #91. 2015-08-31 15:23:01 +01:00
Major- 5519eb50a9 Queue Npcs before they are registered. 2015-08-30 23:28:04 +01:00
Major- dfd52b4a53 Add support for the same shop to belong to multiple npcs. 2015-08-30 23:26:52 +01:00
Major- 9368685bd7 Add walking path verification. 2015-08-30 22:05:28 +01:00
Major- a4186587df Fix GameObject decoding. 2015-08-30 22:05:05 +01:00
Major- b08d9e73b2 Only send CloseInterfaceMessage if an interface is open. 2015-08-30 21:39:00 +01:00
Major- ec95fe9d61 Fix login queue. 2015-08-30 21:20:24 +01:00
Major- ca36264b35 Log startup time as info instead of fine. 2015-08-30 18:38:42 +01:00
Major- e3f10e200d Optimise GameObjectDecoder for faster start-up time. 2015-08-30 18:08:30 +01:00
Major a4eb31bab7 Merge pull request #90 from lare96/master
Use Preconditions in GamePacketBuilder.
2015-08-30 16:52:04 +01:00
lare96 093ecf7086 Merge branch 'master' of https://github.com/lare96/apollo.git 2015-08-30 09:06:50 -04:00
lare96 b41b920f3d Preconditions instead of if-statements for the GamePacketBuilder class. 2015-08-30 09:04:00 -04:00
lare96 1fb443e6ab Fixed the number of bits precondition to 1 inclusive. 2015-08-30 08:59:57 -04:00
lare96 b8223e5787 Preconditions instead of if-statements for the GamePacketBuilder class. 2015-08-30 07:27:48 -04:00
Major- 199d3b63e5 Fix issue #88. 2015-08-30 00:21:25 +01:00
Major- f7661a7fc8 Add shops support. 2015-08-29 22:40:08 +01:00
Major- cdffc15dfc Reformat files modified in previous commit. 2015-08-29 22:38:03 +01:00
Major- 2bc9854ea1 Merge. 2015-08-29 22:30:59 +01:00
Major c3443521f4 Merge pull request #85 from lare96/master
Queue new players.
2015-08-29 22:16:33 +01:00
lare96 8f67274162 Merge branch 'master' of https://github.com/lare96/apollo.git 2015-08-29 16:55:03 -04:00
lare96 b3bc5607d1 New players will be queued rather than added right away. 2015-08-29 16:50:25 -04:00
lare96 a3ee103ed4 Reformat with tabs instead of spaces. 2015-08-29 16:01:07 -04:00
Major- 38af001083 Optimise definition decoding for faster start-up. 2015-08-29 19:57:57 +01:00
lare96 c730c4f88c A small fix to the previous commit. 2015-08-29 14:28:39 -04:00
lare96 dfa852491f New players will be queued rather than added right away. 2015-08-29 14:25:41 -04:00
Major- b134f6fdf5 Merge branch 'master' of https://github.com/apollo-rsps/apollo 2015-08-29 16:12:57 +01:00
Major- c066742588 Fix issue #82. 2015-08-29 16:12:52 +01:00
Major 94e6f0bf38 Merge pull request #83 from lare96/master
Moved Animation constants from Animation.class to emote_tab.rb.
2015-08-29 15:52:24 +01:00
lare96 5ab8fa94f6 Moved Animation constants from Animation.class to emote_tab.rb 2015-08-29 09:39:28 -04:00
Major- 81a763cd69 Fix npc spawning command. 2015-08-29 12:36:08 +01:00
Major- 888230b768 Remove unused BinaryFileUtils class. 2015-08-28 18:25:58 +01:00