2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-21 09:02:07 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Ceikry 2021-03-31 18:23:46 -05:00
commit 3b8a9b15ad
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Server/data/configs/npc_configs.json
View file

@ -5199,7 +5199,7 @@
"attack_level": "1" "attack_level": "1"
}, },
{ {
"examine": "Examine not added", "examine": "An annoying flappy thing.",
"slayer_task": "5", "slayer_task": "5",
"attack_speed": "5", "attack_speed": "5",
"magic_level": "10", "magic_level": "10",
@ -5207,6 +5207,9 @@
"weakness": "4", "weakness": "4",
"slayer_exp": "8", "slayer_exp": "8",
"death_animation": "4918", "death_animation": "4918",
"melee_animation": "4915",
"range_animation": "4915",
"defence_animation": "4916",
"name": "Bat", "name": "Bat",
"defence_level": "2", "defence_level": "2",
"safespot": null, "safespot": null,

3
Server/src/main/java/core/game/content/global/action/DropItemHandler.java
View file

@ -36,7 +36,6 @@ public final class DropItemHandler {
return true; return true;
} }
player.getDialogueInterpreter().close(); player.getDialogueInterpreter().close();
player.getAudioManager().send(new Audio(2393, 0, 0));
player.getPulseManager().clear(); player.getPulseManager().clear();
if (option.equalsIgnoreCase("destroy") || option.equalsIgnoreCase("dissolve")) { if (option.equalsIgnoreCase("destroy") || option.equalsIgnoreCase("dissolve")) {
player.getDialogueInterpreter().open(9878, item); player.getDialogueInterpreter().open(9878, item);
@ -48,7 +47,7 @@ public final class DropItemHandler {
} }
if (player.getInventory().replace(null, item.getSlot()) == item) { if (player.getInventory().replace(null, item.getSlot()) == item) {
item = item.getDropItem(); item = item.getDropItem();
player.getAudioManager().send(new Audio(item.getId() == 995 ? 10 : 2739, 1, 0)); player.getAudioManager().send(new Audio(item.getId() == 995 ? 10 : 2739, 1, 0));//2739 ACTUAL DROP SOUND
GroundItemManager.create(item, player.getLocation(), player); GroundItemManager.create(item, player.getLocation(), player);
PlayerParser.save(player); PlayerParser.save(player);
} }