Commit Graph

6618 Commits

Author SHA1 Message Date
Ryan Bohannon
1eea0c3811 Fix typo in Kourend Library config 2019-02-05 19:08:58 -07:00
Kaz Schmanski
6c1f924f6e slayer plugin: change task name for flesh crawlers to match task given 2019-02-05 20:36:40 -05:00
Adam
b481261a35 Merge pull request #7692 from deathbeam/fix-refresh-discord
Fix Discord party size refresh
2019-02-05 20:31:08 -05:00
jbaker5011
921d2d31d6 Use loot received event for pvp kill screenshots (#6920) 2019-02-05 11:56:09 +00:00
Twinkiel0ver
b140797102 Add Amethyst crafting to Idle Notifier plugin (#7712)
Closes #7709
2019-02-05 11:51:53 +00:00
Tomas Slusny
89dd417d56 Merge pull request #7694 from deathbeam/show-local-sounds-party
Play party ping sound only when ping is in scene
2019-02-05 09:11:03 +00:00
Adam
db90754ca2 Fix npc spawn events sometimes occuring out of order
If an npc spawns and despawns within the same frame, the despawn events
occur prior to the deferred spawn events.
2019-02-04 19:09:58 -05:00
Adam
640e0d2915 mlm plugin: fix ore counter to not count already collected ore 2019-02-04 11:27:45 -05:00
Adam
b530adc89a mlm plugin: make MotherlodeSession a guice managed singleton 2019-02-04 11:27:45 -05:00
Tomas Slusny
39e8f4326b Merge pull request #7693 from deathbeam/fix-party-bars-dissapearing
Do not hide party bars when value is changed to 0
2019-02-04 10:20:51 +00:00
Adam
7eeb484c64 Clear stored npcs in fishing/pc/rc plugins
Fixes #5970
2019-02-03 21:28:11 -05:00
Mabel5
9759137dfe Add Kebos wieldable rods to fishing plugin (#7689) 2019-02-03 23:27:39 +00:00
Tomas Slusny
5f38f74c6f Play party ping sound only when ping is in scene
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-04 00:18:38 +01:00
Tomas Slusny
d2e6c7d0fd Do not hide party bars when value is changed to 0
Instead of checking for current value being > 0 to determine if we have
any stat data, instead check for max value.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-04 00:15:08 +01:00
Tomas Slusny
f49e59b559 Fix Discord party size refresh
When force-refreshing discord presence use updated party size values.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-04 00:13:41 +01:00
Puskunalis
12ae359876 World Map: Fix Zeah Magic tree location and add missing ones (#7683) 2019-02-03 12:18:37 +00:00
TheStonedTurtle
d84a8bae4b Add Bottomless compost bucket price mapping (#7674) 2019-02-03 12:15:29 +00:00
Tomas Slusny
ea79c39b4e Merge pull request #7657 from deathbeam/request-party-sync
Request party sync on party plugin startup
2019-02-03 12:06:06 +00:00
Tomas Slusny
0b7672d12d Merge pull request #7673 from deathbeam/try-catch-ws-message
Prevent WSMessage deserialization failure from closing websocket
2019-02-03 11:27:48 +00:00
Tomas Slusny
e4828a597c Prevent WSMessage deserialization failure from closing websocket
As messages that are serialized and deserialized are purely option and
can vary between source and destination, simply catch deserialization
failure to prevent OkHttp from closing websocket.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-03 00:47:22 +01:00
Tomas Slusny
04f076a6b8 Merge pull request #7566 from ShaunDreclin/sulphur-lizard-health
Add Sulphur Lizard to npc_health.json
2019-02-02 18:52:47 +00:00
Tomas Slusny
c15cf1025d Merge pull request #7655 from deathbeam/fix-party-exceptions
Fix party exceptions (NPE in PartyPlugin and ConcurrentModification in PartyStatsOverlay)
2019-02-02 18:51:57 +00:00
Tomas Slusny
f52c1d732b Fix ConcurrentModification in party stats overlay
Fix concurrent modification exception in party stats overlay when
iterating map.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-02 12:34:56 +01:00
Tomas Slusny
92427968b0 Check for localMember in party not being null on UserJoin
Local user joins last, so all UserJoin events before that will throw NPE
here.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-02 12:34:56 +01:00
Tomas Slusny
137e7e7e30 Merge pull request #7640 from Kamielvf/chambers-layouts-fix
raids plugin: Update LayoutSolver layout codes
2019-02-02 11:26:38 +00:00
Tomas Slusny
bb81128478 Merge pull request #7656 from deathbeam/fix-party-discord-refresh
Do not reset current activity on discord party update
2019-02-02 11:16:16 +00:00
Tomas Slusny
a0a86a9f78 Merge pull request #7659 from Nightfirecat/isempty
client: Use isEmpty() for all Collection emptiness checks
2019-02-02 11:08:50 +00:00
Puskunalis
fc7ff38e26 Inventory Viewer: Fix stackable items not showing stack of "1" (#7654) 2019-02-02 11:08:07 +00:00
Tomas Slusny
e5f3b772a7 Merge pull request #7651 from deathbeam/remove-tag-option
Remove "Tag" toggle from NPC indicators
2019-02-02 11:07:21 +00:00
Adam
22963c72b1 chat controller/service: add boss to pb 2019-02-01 22:29:45 -05:00
Adam
bcdcad2895 Merge pull request #5970 from Nightfirecat/remove-deprecated-api-code
Remove deprecated API code
2019-02-01 21:55:41 -05:00
Jordan Atwood
d1c11b675b Remove deprecated TileObjectQuery class 2019-02-01 21:44:13 -05:00
Jordan Atwood
9e67dcd39e Remove deprecated ActorQuery class 2019-02-01 21:44:13 -05:00
Jordan Atwood
3d3ec76af8 Remove deprecated InventoryItemQuery class 2019-02-01 21:43:48 -05:00
Jordan Atwood
d4f51c4600 Remove deprecated GroundObjectQuery class 2019-02-01 21:43:47 -05:00
Jordan Atwood
732be4e90f Remove deprecated GameObjectQuery class 2019-02-01 21:43:47 -05:00
Jordan Atwood
cec74c6652 Remove deprecated DecorativeObjectQuery class 2019-02-01 21:43:46 -05:00
Jordan Atwood
b408a22d57 Remove deprecated PlayerQuery class 2019-02-01 21:43:46 -05:00
Jordan Atwood
35b7de7dd8 Remove deprecated WallObjectQuery class 2019-02-01 21:43:45 -05:00
Jordan Atwood
764cac7a09 Remove deprecated WorldPoint.toPoint() method 2019-02-01 21:43:44 -05:00
Adam
1bb29d4cd0 api: remove projectile getInteracting
This is unused currently and is being abused by some hacked clients.
2019-02-01 20:52:24 -05:00
Jordan Atwood
a5e72ea610 client: Use isEmpty() for all Collection emptiness checks 2019-02-01 16:50:54 -08:00
Tomas Slusny
fb41c05d3f Request party sync on party plugin startup
If user is in party request party data syncup on party plugin startup

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-01 23:30:18 +01:00
Tomas Slusny
8ff8617755 Do not reset current activity on discord party update
Instead of setting activity to in_game, in_menu just send again current
discord activity.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-01 22:02:48 +01:00
Tomas Slusny
89ba0d8d43 Remove "Tag" toggle from NPC indicators
This toggle was here originally because NPC tagging did not required
shift, but now it does so to bring it with line of other shift-click
plugins, simply remove this option.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-01 17:16:20 +01:00
Tomas Slusny
29fcc2747f Merge pull request #7639 from deathbeam/wtf
Move timestamp color config to timestamp plugin
2019-02-01 09:12:24 +00:00
Tomas Slusny
99d58bb7f2 Merge pull request #7647 from deathbeam/add-missing-config-check
Add missing config check to party leave message
2019-02-01 07:30:42 +00:00
Tomas Slusny
874246bc55 Add missing config check to party leave message
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
2019-02-01 08:23:13 +01:00
Max Weber
77b0f10b92 client: Correctly format PartyChanged 2019-01-31 20:40:34 -07:00
Adam
b72c37c0b4 http api: fix useragent test 2019-01-31 20:37:24 -05:00