2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 08:39:07 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Fixed wrong smelting response when trading & made full iron helm use 2 bars (#457)

Browse Source
This commit is contained in:
Arisu
2020-12-29 10:58:24 -06:00
committed by GitHub
parent 6040241343
commit 3ade7141a6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smelting.java
+3 -3
View File
@@ -124,7 +124,7 @@ public class Smelting extends SkillHandler {
c.getItemAssistant().deleteItem(c.playerSkillProp[13][4], c.playerSkillProp[13][5]); c.getItemAssistant().deleteItem(c.playerSkillProp[13][4], c.playerSkillProp[13][5]);
} }
if (c.playerSkillProp[13][3] == IRON && c.playerSkillProp[13][4] == -1) { if (c.playerSkillProp[13][3] == IRON && c.playerSkillProp[13][4] == -1 && c.isSmelting) {
// Ring of forging // Ring of forging
if (c.playerEquipment[c.playerRing] == 2568) { if (c.playerEquipment[c.playerRing] == 2568) {
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing); c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
@@ -140,11 +140,11 @@ public class Smelting extends SkillHandler {
c.getPacketSender().sendMessage("You failed to smelt the iron bar."); c.getPacketSender().sendMessage("You failed to smelt the iron bar.");
} }
} }
} else if (c.playerSkillProp[13][3] == GOLD && c.playerEquipment[c.playerHands] == 776) { } else if (c.playerSkillProp[13][3] == GOLD && c.playerEquipment[c.playerHands] == 776 && c.isSmelting) {
c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + "."); c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
c.getPlayerAssistant().addSkillXP(56.2, c.playerSmithing); c.getPlayerAssistant().addSkillXP(56.2, c.playerSmithing);
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
} else { } else if (c.isSmelting){
c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + "."); c.getPacketSender().sendMessage("You receive a " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing); c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/SmithingData.java
+1 -1
View File
@@ -40,7 +40,7 @@ public enum SmithingData {
IRON_SCIM(1323, 25, 20, 2), IRON_SCIM(1323, 25, 20, 2),
IRON_LONG(1293, 50, 21, 2), IRON_LONG(1293, 50, 21, 2),
IRON_KNIFE(863, 25, 22, 1), IRON_KNIFE(863, 25, 22, 1),
IRON_FULL(1153, 50, 22, 1), IRON_FULL(1153, 50, 22, 2),
IRON_SQ(1175, 50, 23, 2), IRON_SQ(1175, 50, 23, 2),
IRON_HAMMER(1335, 38, 24, 3), IRON_HAMMER(1335, 38, 24, 3),
IRON_BATTLEAXE(1363, 75, 25, 3), IRON_BATTLEAXE(1363, 75, 25, 3),