yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved handling of unequipping items on death

Browse Source
This commit is contained in:
Player Name
2026-02-08 12:51:23 +00:00
committed by Ryan
parent 364f6460c8
commit 1b9dc0572d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/core/game/container/impl/EquipmentContainer.java
+1 -1
View File
@@ -212,7 +212,7 @@ public final class EquipmentContainer extends Container {
for(Item currentItem : currentItems) { for(Item currentItem : currentItems) {
Plugin<Object> plugin = currentItem.getDefinition().getConfiguration("equipment", null); Plugin<Object> plugin = currentItem.getDefinition().getConfiguration("equipment", null);
if (plugin != null) { if (plugin != null) {
Object object = plugin.fireEvent("unequip", player, currentItem, newItem); Object object = plugin.fireEvent("unequip", player, currentItem);
if (object != null && !((Boolean) object)) { if (object != null && !((Boolean) object)) {
canContinue = false; canContinue = false;
break; break;
Server/src/main/core/game/node/entity/player/Player.java
+6 -4
View File
@@ -3,6 +3,7 @@ package core.game.node.entity.player;
import content.global.handlers.item.equipment.BarrowsEquipment; import content.global.handlers.item.equipment.BarrowsEquipment;
import content.global.handlers.item.equipment.special.SalamanderSwingHandler; import content.global.handlers.item.equipment.special.SalamanderSwingHandler;
import content.global.skill.runecrafting.PouchManager; import content.global.skill.runecrafting.PouchManager;
import content.global.skill.slayer.SlayerEquipmentFlags;
import core.api.ContentAPIKt; import core.api.ContentAPIKt;
import core.game.component.Component; import core.game.component.Component;
import core.game.container.Container; import core.game.container.Container;
@@ -638,7 +639,7 @@ public class Player extends Entity {
if (i == null) continue; if (i == null) continue;
InteractionListeners.run(i.getId(), this, i, false); InteractionListeners.run(i.getId(), this, i, false);
Plugin equipPlugin = i.getDefinition().getConfiguration("equipment", null); Plugin equipPlugin = i.getDefinition().getConfiguration("equipment", null);
if (equipPlugin != null) equipPlugin.fireEvent("unequip"); if (equipPlugin != null) equipPlugin.fireEvent("unequip", this, i);
} }
boolean canCreateGrave = GraveController.allowGenerate(this); boolean canCreateGrave = GraveController.allowGenerate(this);
@@ -669,9 +670,9 @@ public class Player extends Entity {
} }
if (BarrowsEquipment.isBarrowsItem(item.getId())) { if (BarrowsEquipment.isBarrowsItem(item.getId())) {
if (!BarrowsEquipment.isBroken(item.getId())) { if (!BarrowsEquipment.isBroken(item.getId())) {
int brokenItemId = Objects.requireNonNull(BarrowsEquipment.getDefinition(item.getId())).getBrokenId(); int brokenItemId = Objects.requireNonNull(BarrowsEquipment.getDefinition(item.getId())).getBrokenId();
item = new Item(brokenItemId, item.getAmount()); item = new Item(brokenItemId, item.getAmount());
} }
} else { } else {
item = GraveController.checkTransform(item); item = GraveController.checkTransform(item);
} }
@@ -687,6 +688,7 @@ public class Player extends Entity {
} }
equipment.clear(); equipment.clear();
SlayerEquipmentFlags.updateFlags(this);
inventory.clear(); inventory.clear();
inventory.addAll(c[0]); inventory.addAll(c[0]);
familiarManager.dismiss(); familiarManager.dismiss();