EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 11:14:44 +02:00
Code Issues Projects Releases Wiki Activity

Clean up some of our messes.

Browse Source
This commit is contained in:
GJ
2014-01-20 13:58:40 -08:00
parent c6ea32f0b0
commit 43e2c813d1
47 changed files with 133 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@ -1,6 +1,5 @@
package com.gmail.nossr50.skills.herbalism;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@ -134,7 +133,7 @@ public class HerbalismManager extends SkillManager {
Collection<ItemStack> drops = null;
int amount = 1;
int xp = 0;
int xp;
boolean greenTerra = mcMMOPlayer.getAbilityMode(skill.getAbility());
if (ModUtils.isCustomHerbalismBlock(blockState)) {
@ -203,7 +202,7 @@ public class HerbalismManager extends SkillManager {
return false;
}
List<HylianTreasure> treasures = new ArrayList<HylianTreasure>();
List<HylianTreasure> treasures;
switch (blockState.getType()) {
case DEAD_BUSH:

10
src/main/java/com/gmail/nossr50/skills/repair/Repair.java
View File

@ -33,15 +33,7 @@ public class Repair {
* @return true if the item is salvageable, false otherwise
*/
public static boolean isSalvageable(ItemStack item) {
if (Config.getInstance().getSalvageTools() && ItemUtils.isMinecraftTool(item)) {
return true;
}
if (Config.getInstance().getSalvageArmor() && !ItemUtils.isChainmailArmor(item) && ItemUtils.isMinecraftArmor(item)) {
return true;
}
return false;
return (Config.getInstance().getSalvageTools() && ItemUtils.isMinecraftTool(item)) || (Config.getInstance().getSalvageArmor() && !ItemUtils.isChainmailArmor(item) && ItemUtils.isMinecraftArmor(item));
}
public static String getAnvilMessage(Material type) {

7
src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java
View File

@ -26,9 +26,7 @@ public class Unarmed {
if (inventory.containsAtLeast(dropStack, 1)) {
int nextSlot = 0;
for (Iterator<ItemStack> iterator = inventory.iterator(); iterator.hasNext();) {
ItemStack itemstack = iterator.next();
for (ItemStack itemstack: inventory) {
if (dropStack.isSimilar(itemstack)) {
int itemAmount = itemstack.getAmount();
int itemMax = itemstack.getMaxStackSize();
@ -71,7 +69,8 @@ public class Unarmed {
nextSlot++;
}
} else if (firstEmpty != -1) {
}
else if (firstEmpty != -1) {
drop.remove();
dropStack.setAmount(dropAmount);
inventory.setItem(firstEmpty, dropStack);