Goldenwere/GibsoniaCraft
Archived
1
0
Fork 0
Code Activity

removed blockchecking made redundant by update to GetSurroundingBlocks, removed unused variables

Browse source
This commit is contained in:
lightling 2019-09-18 21:12:13 -04:00
parent 0919be0f1c
commit d3268afef5
1 changed files with 12 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,29 +81,17 @@ public class BlockListener implements Listener
// Iterates through to break surrounding blocks // Iterates through to break surrounding blocks
for (Block b : blocks) for (Block b : blocks)
{
// Determine the block type and position
Material blockMat = b.getType();
Location blockLoc = b.getLocation();
// Determine whether an appropriate tool is being used
boolean isExc = ToolUtil.IsExcavatable(item, blockMat);
boolean isHam = ToolUtil.IsHammerable(item, blockMat);
// If using the correct tools, break surrounding blocks
if (isExc || isHam)
{ {
// Handle snow // Handle snow
if (blockMat == Material.SNOW && isExc) if (b.getType() == Material.SNOW)
{ {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
final ItemStack snow = new ItemStack(Material.SNOWBALL, 1 + b.getData()); final ItemStack snow = new ItemStack(Material.SNOWBALL, 1 + b.getData());
b.getWorld().dropItemNaturally(blockLoc, snow); b.getWorld().dropItemNaturally(b.getLocation(), snow);
} }
b.breakNaturally(); b.breakNaturally();
} }
}
// Used for determining durability loss // Used for determining durability loss
@ -147,7 +135,6 @@ public class BlockListener implements Listener
// Grab current tool information // Grab current tool information
Player player = bbEvent.getPlayer(); Player player = bbEvent.getPlayer();
ItemStack item = player.getInventory().getItemInMainHand(); ItemStack item = player.getInventory().getItemInMainHand();
Material itemType = item.getType();
// Get block information via the player listener // Get block information via the player listener
Block block = bbEvent.getBlock(); Block block = bbEvent.getBlock();
@ -179,19 +166,9 @@ public class BlockListener implements Listener
} }
for (Block b : ToolUtil.GetUpwardLogs(block)) for (Block b : ToolUtil.GetUpwardLogs(block))
{
// Determine the block type and position
Material blockMat = b.getType();
Location blockLoc = b.getLocation();
// Determine whether an appropriate tool is being used
boolean isAxe = ToolUtil.IsLumberAxeable(item, blockMat);
if (isAxe)
{ {
b.breakNaturally(); b.breakNaturally();
} }
}
// Used for determining durability loss // Used for determining durability loss
int addToDamage = 1; int addToDamage = 1;
@ -202,7 +179,7 @@ public class BlockListener implements Listener
addToDamage = 2; addToDamage = 2;
// Diamond tools take less damage // Diamond tools take less damage
if (itemType == Material.DIAMOND_AXE) if (item.getType() == Material.DIAMOND_AXE)
{ {
addToDamage = 1; addToDamage = 1;
} }