Goldenwere/GibsoniaCraft
Archived
1
0
Fork 0
Code Activity

edited intial checks to include both tooltype and blocktype rather than just tool

Browse source 
bug initially noticed when using lumber-axe on melons - axe would take 2 damage
This commit is contained in:
lightling 2019-09-18 20:48:36 -04:00
parent 006358d2a3
commit 0e0bb1c16f
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugin/plugin.yml
View file

@ -1,6 +1,6 @@
main: lightling.gibsoniacraft.GibsoniaCraft main: lightling.gibsoniacraft.GibsoniaCraft
name: GibsoniaCraft name: GibsoniaCraft
version: 1.1.3 version: 1.1.4
author: Lightling author: Lightling
description: Adds some small additions/changes to a PaperMC server description: Adds some small additions/changes to a PaperMC server
api-version: 1.14 api-version: 1.14

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

@ -48,21 +48,19 @@ public class BlockListener implements Listener
ItemStack item = player.getInventory().getItemInMainHand(); ItemStack item = player.getInventory().getItemInMainHand();
Material itemType = item.getType(); Material itemType = item.getType();
// Grab the current block information
Block block = bbEvent.getBlock();
// Only do extra block-breaking if the player is not sneaking (method of disabling) or if the player doesn't have the appropriate tools // Only do extra block-breaking if the player is not sneaking (method of disabling) or if the player doesn't have the appropriate tools
if (player != null && (player instanceof Player)) if (player != null && (player instanceof Player))
{ {
if (player.isSneaking()) if (player.isSneaking() || !ToolUtil.IsExcavatable(item, block.getType()) && !ToolUtil.IsHammerable(item, block.getType()))
{ {
return; return;
} }
if (!ToolUtil.IsExcavator(item) && !ToolUtil.IsHammer(item))
{
return;
}
} }
// Get blockface information via the player listener // Get blockface information via the player listener
Block block = bbEvent.getBlock();
String pName = player.getName(); String pName = player.getName();
PlayerInteractListener pListener = gcPlugin.GetPlayerInteractListener(); PlayerInteractListener pListener = gcPlugin.GetPlayerInteractListener();
BlockFace blockFace = pListener.GetFaceByName(pName); BlockFace blockFace = pListener.GetFaceByName(pName);
@ -151,21 +149,20 @@ public class BlockListener implements Listener
ItemStack item = player.getInventory().getItemInMainHand(); ItemStack item = player.getInventory().getItemInMainHand();
Material itemType = item.getType(); Material itemType = item.getType();
// Only do extra block-breaking if the player is not sneaking (method of disabling) or if the player doesn't have the appropriate tools // Get block information via the player listener
Block block = bbEvent.getBlock();
// Only do extra block-breaking if the player is not sneaking (method of disabling)
// Or if the player is breaking the incorrect block/using the incorrect tool
if (player != null && (player instanceof Player)) if (player != null && (player instanceof Player))
{ {
if (player.isSneaking()) if (player.isSneaking() || !ToolUtil.IsLumberAxeable(item, block.getType()))
{ {
return; return;
} }
if (!ToolUtil.IsLumberAxe(item))
{
return;
}
} }
// Get block information via the player listener // Get all of the relevant blocks that are a part of the tree
Block block = bbEvent.getBlock();
ArrayList<Block> blocks = ToolUtil.GetUpwardLogs(block); ArrayList<Block> blocks = ToolUtil.GetUpwardLogs(block);
// Grab durability information // Grab durability information
@ -178,6 +175,7 @@ public class BlockListener implements Listener
boolean success = false; boolean success = false;
if (blocks.size() > 1) if (blocks.size() > 1)
{ {
System.out.println("Blocks.size() = " + blocks.size());
success = true; success = true;
} }

1
plugin/src/lightling/gibsoniacraft/util/BlockRef.java
View file

@ -46,6 +46,7 @@ public class BlockRef
add(Material.END_STONE); add(Material.END_STONE);
add(Material.NETHERRACK); add(Material.NETHERRACK);
add(Material.NETHER_QUARTZ_ORE); add(Material.NETHER_QUARTZ_ORE);
add(Material.OBSIDIAN);
}}; }};
/** /**