From 7f16339bd9022c4fd02ae72a242e4227e62dff40 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sun, 2 Dec 2012 22:44:26 +0100 Subject: [PATCH 1/2] Fixed a small bug where players could salvage items in creative mode --- .gitignore | 2 +- .../gmail/nossr50/skills/repair/Salvage.java | 38 ++++++++++--------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index f934fc574..3fa62546b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# Eclipse stuffs +# Eclipse stuff /.classpath /.project /.settings diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java b/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java index 6da4df75c..a67fea83b 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java @@ -27,27 +27,29 @@ public class Salvage { return; } - final PlayerProfile profile = Users.getProfile(player); - final int skillLevel = profile.getSkillLevel(SkillType.REPAIR); - final int unlockLevel = configInstance.getSalvageUnlockLevel(); + if (player.getGameMode().equals(0)){ + final PlayerProfile profile = Users.getProfile(player); + final int skillLevel = profile.getSkillLevel(SkillType.REPAIR); + final int unlockLevel = configInstance.getSalvageUnlockLevel(); - if (skillLevel >= unlockLevel) { - final World world = player.getWorld(); - final float currentdura = inHand.getDurability(); + if (skillLevel >= unlockLevel) { + final World world = player.getWorld(); + final float currentdura = inHand.getDurability(); - if (currentdura == 0) { - final int salvagedAmount = getSalvagedAmount(inHand); - final int itemID = getSalvagedItemID(inHand); + if (currentdura == 0) { + final int salvagedAmount = getSalvagedAmount(inHand); + final int itemID = getSalvagedItemID(inHand); - player.setItemInHand(new ItemStack(0)); - location.setY(location.getY() + 1); - world.dropItem(location, new ItemStack(itemID, salvagedAmount)); - player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess")); - } else { - player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability")); - } - } else { - player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage")); + player.setItemInHand(new ItemStack(0)); + location.setY(location.getY() + 1); + world.dropItem(location, new ItemStack(itemID, salvagedAmount)); + player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess")); + } else { + player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability")); + } + } else { + player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage")); + } } } From de93b11c252038b9bc209e6bcce71990b38a1590 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sun, 2 Dec 2012 22:54:03 +0100 Subject: [PATCH 2/2] Fixed an error where Greater Impact was confused with Armor Impact --- src/main/java/com/gmail/nossr50/config/AdvancedConfig.java | 3 ++- src/main/java/com/gmail/nossr50/skills/combat/Axes.java | 2 +- src/main/resources/advanced.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index 164fb386f..91208c13d 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -57,9 +57,10 @@ public class AdvancedConfig extends ConfigLoader { public int getAxesCriticalPVEModifier() { return config.getInt("Skills.Axes.AxesCritical_PVE_Modifier", 2); } public int getGreaterImpactChance() { return config.getInt("Skills.Axes.GreaterImpact_Chance", 25); } - public int getGreaterImpactIncreaseLevel() { return config.getInt("Skills.Axes.GreaterImpact_IncreaseLevel", 50); } public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact_KnockbackModifier", 1.5); } public int getGreaterImpactBonusDamage() { return config.getInt("Skills.Axes.GreaterImpact_BonusDamage", 2); } + + public int getArmorImpactIncreaseLevel() { return config.getInt("Skills.Axes.ArmorImpact_IncreaseLevel", 50); } /* EXCAVATION */ //Nothing to configure, everything is already configurable in config.yml diff --git a/src/main/java/com/gmail/nossr50/skills/combat/Axes.java b/src/main/java/com/gmail/nossr50/skills/combat/Axes.java index 1306f2690..22b1cf4f5 100644 --- a/src/main/java/com/gmail/nossr50/skills/combat/Axes.java +++ b/src/main/java/com/gmail/nossr50/skills/combat/Axes.java @@ -129,7 +129,7 @@ public class Axes { short durabilityDamage = 1; //Start with 1 durability damage /* Every 30 Skill Levels you gain 1 durability damage */ - int impactIncreaseLevel = advancedConfig.getGreaterImpactIncreaseLevel(); + int impactIncreaseLevel = advancedConfig.getArmorImpactIncreaseLevel(); durabilityDamage += (int) ((double) Users.getProfile(attacker).getSkillLevel(SkillType.AXES) / (double) impactIncreaseLevel); if (!hasArmor(targetPlayer)) { diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml index c578513ee..939e69e55 100644 --- a/src/main/resources/advanced.yml +++ b/src/main/resources/advanced.yml @@ -42,9 +42,9 @@ Skills: AxesCritical_PVP_Modifier: 1.5 AxesCritical_PVE_Modifier: 2 GreaterImpact_Chance: 25 - GreaterImpact_IncreaseLevel: 50 GreaterImpact_KnockbackModifier: 1.5 GreaterImpact_BonusDamage: 2 + ArmorImpact_IncreaseLevel: 50 Fishing: Shake_UnlockLevel: 150 Enchantment_Chance: 10