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

Runecrafting pouches now synchronise across bank instances

Browse Source 
BoB can no longer be used to smuggle weapons to Entrana
This commit is contained in:
Player Name
2025-02-18 06:24:14 +00:00
committed by Ryan
parent d65a53b275
commit cf08e700fb
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/core/api/ContentAPI.kt
+9 -2
View File
@@ -408,14 +408,21 @@ fun replaceSlot(player: Player, slot: Int, item: Item, currentItem: Item? = null
*/
fun replaceAllItems(player: Player, itemId: Int, replaceId: Int) {
val item = Item(itemId)
for (container in arrayOf(player.inventory, player.equipment, player.bankPrimary, player.bankSecondary)) {
val containers = if (player.familiarManager.hasFamiliar() && player.familiarManager.familiar.isBurdenBeast()) {
arrayOf(player.inventory, player.equipment, player.bankPrimary, player.bankSecondary, (player.familiarManager.familiar as BurdenBeast).container)
} else {
arrayOf(player.inventory, player.equipment, player.bankPrimary, player.bankSecondary)
}
for (container in containers) {
val hasItems = container.getAll(item)
if (!item.definition.isStackable && (container == player.inventory || container == player.equipment)) {
if (!item.definition.isStackable && container != player.bankPrimary && container != player.bankSecondary) {
// just replace
for (target in hasItems) {
val newItem = Item(replaceId, target.amount)
container.replace(newItem, target.slot, true)
}
} else {
// add to existing stack if possible
if (hasItems.size > 0) {
val target = hasItems[0]
var count = 0
Server/src/main/core/cache/def/impl/ItemDefinition.java
Vendored
+7 -2
View File
@@ -605,8 +605,13 @@ public class ItemDefinition extends Definition<Item> {
* @return {@code True} if so.
*/
public static boolean canEnterEntrana(Player player) {
Container[] container = new Container[] { player.getInventory(), player.getEquipment() };
for (Container c : container) {
Container[] containers;
if (player.getFamiliarManager().hasFamiliar() && player.getFamiliarManager().getFamiliar().isBurdenBeast()) {
containers = new Container[] { player.getInventory(), player.getEquipment(), ((BurdenBeast) player.getFamiliarManager().getFamiliar()).getContainer() };
} else {
containers = new Container[] { player.getInventory(), player.getEquipment() };
}
for (Container c : containers) {
for (Item i : c.toArray()) {
if (i == null) {
continue;