Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge 2009scape updates #19

Open
randy wants to merge 204 commits from 2009Scape:master into upstream
pull from: 2009Scape:master
merge into: Snowscape:upstream
Conversation 0 Commits 204 Files changed 719 +24 -14
2 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 50eb7582dd - Show all commits

25
Server/src/main/core/game/container/impl/BankContainer.java
View file

@ -1,13 +1,10 @@
package core.game.container.impl;
import core.api.IfaceSettingsBuilder;
import core.game.container.access.InterfaceContainer;
import kotlin.Unit;
import kotlin.ranges.IntRange;
import org.rs09.consts.Vars;
import core.ServerConstants;
import core.api.IfaceSettingsBuilder;
import core.game.component.Component;
import core.game.container.*;
import core.game.container.access.InterfaceContainer;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.IronmanMode;
import core.game.node.item.Item;
@ -16,8 +13,8 @@ import core.game.world.GameWorld;
import core.net.packet.PacketRepository;
import core.net.packet.context.ContainerContext;
import core.net.packet.out.ContainerPacket;
import java.nio.ByteBuffer;
import kotlin.ranges.IntRange;
import org.rs09.consts.Vars;
import static core.api.ContentAPIKt.*;
@ -201,14 +198,9 @@ public final class BankContainer extends Container {
}
item = new Item(item.getId(), amount, item.getCharge());
boolean unnote = !item.getDefinition().isUnnoted();
Item add = item.toUnnotedItem();
Item add = unnote ? new Item(item.getDefinition().getNoteId(), amount, item.getCharge()) : item;
if (unnote && !add.getDefinition().isUnnoted()) {
add = item;
}
int maxCount = super.getMaximumAdd(add);
int maxCount = getMaximumAdd(add);
if (amount > maxCount) {
add.setAmount(maxCount);
item.setAmount(maxCount);
@ -474,6 +466,11 @@ public final class BankContainer extends Container {
return open;
}
@Override
public int getMaximumAdd(Item item) {
return super.getMaximumAdd(item.toUnnotedItem());
}
/**
* Listens to the bank container.
* @author Emperor

13
Server/src/main/core/game/node/item/Item.java
View file

@ -135,6 +135,19 @@ public class Item extends Node{
return getId();
}
/**
* Converts noted items into unnoted items.
*
* @return The unnoted version of the item. Returns the original Item if already unnoted.
*/
public Item toUnnotedItem() {
if (definition.isUnnoted()) {
return this;
} else {
return new Item(definition.getNoteId(), getAmount(), getCharge());
}
}
/**
* @return the id
*/