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

Fixed loss of equippable items when swapped with another item that is dropped in the same tick

Browse source
This commit is contained in:
Player Name 2025-02-18 06:03:18 +00:00 • committed by Ryan
parent fb9d6307b3
commit d65a53b275
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Server/src/main/core/game/global/action/DropListener.kt
View file

@ -12,6 +12,8 @@ import core.game.node.item.GroundItemManager
import core.game.node.item.Item import core.game.node.item.Item
import core.game.system.config.ItemConfigParser import core.game.system.config.ItemConfigParser
import content.global.skill.summoning.pet.Pets import content.global.skill.summoning.pet.Pets
import core.game.node.entity.player.info.LogType
import core.game.node.entity.player.info.PlayerMonitor
import org.rs09.consts.Items import org.rs09.consts.Items
import org.rs09.consts.Sounds import org.rs09.consts.Sounds
@ -33,7 +35,7 @@ class DropListener : InteractionListener {
} }
private fun handleDropAction(player: Player, node: Node) : Boolean { private fun handleDropAction(player: Player, node: Node) : Boolean {
val option = getUsedOption(player) val option = getUsedOption(player)
var item = node as? Item ?: return false val item = node as? Item ?: return false
if (option == "drop") { if (option == "drop") {
if (Pets.forId(item.id) != null) { if (Pets.forId(item.id) != null) {
player.familiarManager.summon(item, true, true) player.familiarManager.summon(item, true, true)
@ -43,12 +45,21 @@ class DropListener : InteractionListener {
sendMessage(player, "You cannot drop items on top of graves!") sendMessage(player, "You cannot drop items on top of graves!")
return false return false
} }
if (getAttribute(player, "equipLock:${node.id}", 0 ) > getWorldTicks()) if (player.locks.equipmentLock != null) {
return false return false
}
closeAllInterfaces(player) closeAllInterfaces(player)
queueScript (player, strength = QueueStrength.SOFT) { queueScript(player, strength = QueueStrength.SOFT) { //do this as a script to allow dropping multiple items in the same tick (authentic)
if (player.inventory.replace(null, item.slot) != item) return@queueScript stopExecuting(player) // It's possible for state to change between queueing the script and executing it at the end of the tick (https://forum.2009scape.org/viewtopic.php?f=8&t=1195-lost-bandos-chestplate-whilst-making-iron-titans&p=5292). So, sanity check:
val current = player.inventory.get(item.slot)
if (current == null || current !== item) {
return@queueScript stopExecuting(player)
}
if (player.inventory.replace(null, item.slot) !== item) {
PlayerMonitor.log(player, LogType.DUPE_ALERT, "Potential exploit attempt when player ${player.name} tried to drop ${item.amount}x ${item.id}. The item has been lost and will need to be refunded to the player, but how did they get this to happen?")
return@queueScript stopExecuting(player)
}
val droppedItem = item.dropItem val droppedItem = item.dropItem
if (droppedItem.id == Items.COINS_995) playAudio(player, DROP_COINS_SOUND) else playAudio(player, DROP_ITEM_SOUND) if (droppedItem.id == Items.COINS_995) playAudio(player, DROP_COINS_SOUND) else playAudio(player, DROP_ITEM_SOUND)
GroundItemManager.create(droppedItem, player.location, player) GroundItemManager.create(droppedItem, player.location, player)