mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-03 00:31:51 +00:00
Fixed the delay on banking a non stackable item (#341)
Brought back old code as what I previously did affected the time it takes to bank items.
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -8,62 +8,62 @@ import com.rebotted.game.players.Player;
|
||||
*/
|
||||
public class Weight extends ItemDefinitions {
|
||||
|
||||
/**
|
||||
* Calculates the weight when doing actions
|
||||
*
|
||||
* @param c
|
||||
* @param item
|
||||
* @param action
|
||||
* - deleteitem, additem, equip, unequip.
|
||||
*/
|
||||
private static void calcWeight(Player c, int item, String action) {
|
||||
if (action.equalsIgnoreCase("deleteitem")) {
|
||||
if (getWeight(item) > 99.20) {
|
||||
c.weight -= getWeight(item) / 100;
|
||||
if (c.weight < 0) {
|
||||
c.weight = 0.0;
|
||||
}
|
||||
c.getPacketSender().writeWeight((int) c.weight);
|
||||
return;
|
||||
}
|
||||
c.weight -= getWeight(item) / 10;
|
||||
if (c.weight < 0) {
|
||||
c.weight = 0.0;
|
||||
}
|
||||
c.getPacketSender().writeWeight((int) c.weight);
|
||||
} else if (action.equalsIgnoreCase("additem")) {
|
||||
if (getWeight(item) > 99.20) {
|
||||
c.weight += getWeight(item) / 100;
|
||||
c.getPacketSender().writeWeight((int) c.weight);
|
||||
return;
|
||||
}
|
||||
c.weight += getWeight(item) / 10;
|
||||
c.getPacketSender().writeWeight((int) c.weight);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Calculates the weight when doing actions
|
||||
*
|
||||
* @param c
|
||||
* @param item
|
||||
* @param action
|
||||
* - deleteitem, additem, equip, unequip.
|
||||
*/
|
||||
public static void calcWeight(Player c, int item, String action) {
|
||||
if (action.equalsIgnoreCase("deleteitem")) {
|
||||
if (getWeight(item) > 99.20) {
|
||||
c.weight -= getWeight(item) / 100;
|
||||
if (c.weight < 0) {
|
||||
c.weight = 0.0;
|
||||
}
|
||||
c.getPacketSender().writeWeight((int) c.weight);
|
||||
return;
|
||||
}
|
||||
c.weight -= getWeight(item) / 10;
|
||||
if (c.weight < 0) {
|
||||
c.weight = 0.0;
|
||||
}
|
||||
c.getPacketSender().writeWeight((int) c.weight);
|
||||
} else if (action.equalsIgnoreCase("additem")) {
|
||||
if (getWeight(item) > 99.20) {
|
||||
c.weight += getWeight(item) / 100;
|
||||
c.getPacketSender().writeWeight((int) c.weight);
|
||||
return;
|
||||
}
|
||||
c.weight += getWeight(item) / 10;
|
||||
c.getPacketSender().writeWeight((int) c.weight);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the weight for inventory and equipment.
|
||||
*
|
||||
* @param player
|
||||
*/
|
||||
public static void updateWeight(Player player) {
|
||||
if (player != null) {
|
||||
player.weight = 0;
|
||||
// Inventory items
|
||||
for (int playerItem : player.playerItems) {
|
||||
if (playerItem > -1) {// inventory
|
||||
calcWeight(player, playerItem, "addItem");
|
||||
}
|
||||
}
|
||||
// Equiped items
|
||||
for (int element : player.playerEquipment) {
|
||||
if (element > -1) {// equipment
|
||||
if (element == 88) player.weight -= 4.5;
|
||||
else calcWeight(player, element, "addItem");
|
||||
}
|
||||
}
|
||||
player.getPacketSender().writeWeight((int) player.weight);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Updates the weight for inventory and equipment.
|
||||
*
|
||||
* @param player
|
||||
*/
|
||||
public static void updateWeight(Player player) {
|
||||
if (player != null) {
|
||||
player.weight = 0;
|
||||
// Inventory items
|
||||
for (int playerItem : player.playerItems) {
|
||||
if (playerItem > -1) {// inventory
|
||||
calcWeight(player, playerItem, "addItem");
|
||||
}
|
||||
}
|
||||
// Equiped items
|
||||
for (int element : player.playerEquipment) {
|
||||
if (element > -1) {// equipment
|
||||
if (element == 88) player.weight -= 4.5;
|
||||
else calcWeight(player, element, "addItem");
|
||||
}
|
||||
}
|
||||
}
|
||||
player.getPacketSender().writeWeight((int) player.weight);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user