Goldenwere/GibsoniaCraft
Archived
1
0
Fork 0
Code Activity

fixed issue where all pickaxes and shovels were being considered a hammer/excavator

Browse source
This commit is contained in:
lightling 2019-09-13 16:17:14 -04:00
parent 747efa0ed3
commit c31ec1ad05
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugin/src/lightling/gibsoniacraft/util/BlockListener.java
View file

@ -48,7 +48,7 @@ public class BlockListener implements Listener
{ {
return; return;
} }
if (!ToolUtil.IsExcavator(itemType) && !ToolUtil.IsHammer(itemType)) if (!ToolUtil.IsExcavator(item) && !ToolUtil.IsHammer(item))
{ {
return; return;
} }
@ -77,8 +77,8 @@ public class BlockListener implements Listener
Location blockLoc = b.getLocation(); Location blockLoc = b.getLocation();
// Determine whether an appropriate tool is being used // Determine whether an appropriate tool is being used
boolean isExc = ToolUtil.IsExcavatable(itemType, blockMat); boolean isExc = ToolUtil.IsExcavatable(item, blockMat);
boolean isHam = ToolUtil.IsHammerable(itemType, blockMat); boolean isHam = ToolUtil.IsHammerable(item, blockMat);
// If using the correct tools, break surrounding blocks // If using the correct tools, break surrounding blocks
if (isExc || isHam) if (isExc || isHam)

24
plugin/src/lightling/gibsoniacraft/util/ToolUtil.java
View file

@ -2,10 +2,12 @@ package lightling.gibsoniacraft.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.inventory.ItemStack;
import org.bukkit.World; import org.bukkit.World;
/** /**
@ -39,9 +41,14 @@ public class ToolUtil
* @param mat The material being checked * @param mat The material being checked
* @return Whether the item is a valid hammer * @return Whether the item is a valid hammer
*/ */
public static boolean IsHammer(Material mat) public static boolean IsHammer(ItemStack item)
{ {
return BlockRef.ValidHammers.contains(mat); List<String> lore = item.getLore();
Material mat = item.getType();
if (lore != null && mat != null)
return BlockRef.ValidHammers.contains(mat) && lore.contains("Based off of item from PowerMining/Tinkers' Construct");
else
return false;
} }
/** /**
@ -49,9 +56,14 @@ public class ToolUtil
* @param mat The material being checked * @param mat The material being checked
* @return Whether the item is a valid excavator * @return Whether the item is a valid excavator
*/ */
public static boolean IsExcavator(Material mat) public static boolean IsExcavator(ItemStack item)
{ {
return BlockRef.ValidExcavators.contains(mat); List<String> lore = item.getLore();
Material mat = item.getType();
if (lore != null && mat != null)
return BlockRef.ValidExcavators.contains(mat) && lore.contains("Based off of item from PowerMining/Tinkers' Construct");
else
return false;
} }
/** /**
@ -60,7 +72,7 @@ public class ToolUtil
* @param block The block that should be mineable * @param block The block that should be mineable
* @return Valid or invalid action * @return Valid or invalid action
*/ */
public static boolean IsHammerable(Material ham, Material block) public static boolean IsHammerable(ItemStack ham, Material block)
{ {
return IsMineable(block) && IsHammer(ham); return IsMineable(block) && IsHammer(ham);
} }
@ -71,7 +83,7 @@ public class ToolUtil
* @param block The block that should be diggable * @param block The block that should be diggable
* @return Valid or invalid action * @return Valid or invalid action
*/ */
public static boolean IsExcavatable(Material exc, Material block) public static boolean IsExcavatable(ItemStack exc, Material block)
{ {
return IsDiggable(block) && IsExcavator(exc); return IsDiggable(block) && IsExcavator(exc);
} }