From 77cccfb7647ee99fa72fc8efba9810eba7a6dc3c Mon Sep 17 00:00:00 2001 From: ceikry Date: Sat, 26 Mar 2022 13:35:00 -0500 Subject: [PATCH] Touched up cooking a bit --- .../interaction/item/withobject/TutorialFurnaceHandler.java | 3 ++- .../entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java | 2 +- .../core/game/node/entity/skill/smithing/SmithingPulse.java | 2 +- .../node/entity/skill/smithing/smelting/SmeltingPulse.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Server/src/main/java/core/game/interaction/item/withobject/TutorialFurnaceHandler.java b/Server/src/main/java/core/game/interaction/item/withobject/TutorialFurnaceHandler.java index 0430b45d0..87fed00ca 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/TutorialFurnaceHandler.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/TutorialFurnaceHandler.java @@ -9,6 +9,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; +import org.rs09.consts.Items; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; @@ -40,7 +41,7 @@ public class TutorialFurnaceHandler extends UseWithHandler { player.getInventory().remove(new Item(436, 1)); player.getInventory().add(Bar.BRONZE.getProduct()); player.getSkills().addExperience(Skills.SMITHING, Bar.BRONZE.getExperience()); - player.dispatch(new ResourceProducedEvent(Bar.BRONZE.getProduct().getId(), 1, player)); + player.dispatch(new ResourceProducedEvent(Bar.BRONZE.getProduct().getId(), 1, player, Items.COPPER_ORE_436)); return true; } diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java index 18f54d3ac..83108b8ef 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java @@ -151,7 +151,7 @@ public class WoodcuttingSkillPulse extends Pulse { } //give the reward player.getInventory().add(new Item(reward, rewardAmount)); - player.dispatch(new ResourceProducedEvent(reward, rewardAmount, node)); + player.dispatch(new ResourceProducedEvent(reward, rewardAmount, node, -1)); int cutLogs = player.getAttribute(STATS_BASE + ":" + STATS_LOGS,0); player.setAttribute("/save:" + STATS_BASE + ":" + STATS_LOGS,++cutLogs); diff --git a/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingPulse.java b/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingPulse.java index 8bc744509..8c4f95f15 100644 --- a/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingPulse.java @@ -89,7 +89,7 @@ public class SmithingPulse extends SkillPulse { player.getInventory().remove(new Item(bar.getBarType().getBarType(), bar.getSmithingType().getRequired())); final Item item = new Item(node.getId(), bar.getSmithingType().getProductAmount()); player.getInventory().add(item); - player.dispatch(new ResourceProducedEvent(item.getId(), 1, player)); + player.dispatch(new ResourceProducedEvent(item.getId(), 1, player, bar.getBarType().getBarType())); player.getSkills().addExperience(Skills.SMITHING, bar.getBarType().getExperience() * bar.getSmithingType().getRequired(), true); String message = StringUtils.isPlusN(ItemDefinition.forId(bar.getProduct()).getName().toLowerCase()) ? "an" : "a"; player.getPacketDispatch().sendMessage("You hammer the " + bar.getBarType().getBarName().toLowerCase().replace("smithing", "") + "and make " + message + " " + ItemDefinition.forId(bar.getProduct()).getName().toLowerCase() + "."); diff --git a/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java b/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java index c26f7025e..fdd6db7ae 100644 --- a/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java @@ -143,7 +143,7 @@ public class SmeltingPulse extends SkillPulse { } } player.getInventory().add(new Item(bar.getProduct().getId(), amt)); - player.dispatch(new ResourceProducedEvent(bar.getProduct().getId(), 1, player)); + player.dispatch(new ResourceProducedEvent(bar.getProduct().getId(), 1, player, -1)); double xp = bar.getExperience() * amt; // Goldsmith gauntlets if (((player.getEquipment().get(EquipmentContainer.SLOT_HANDS) != null