Goldenwere/GibsoniaCraft
Archived
1
0
Fork 0
Code Activity

made GetSurroundingBlocks require the tool being used

Browse source 
If a diggable block is next to a block being mined with hammer, or if a mineable block is next to a block being dug with an excavator, durability would decrease by two instead of one due to the original check adding both diggable and mineable blocks to the list
This commit is contained in:
lightling 2019-09-18 21:04:32 -04:00
parent 16ca095e3e
commit 0919be0f1c
3 changed files with 7 additions and 6 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.4 version: 2.0.0
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

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

@ -64,7 +64,7 @@ public class BlockListener implements Listener
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);
ArrayList<Block> blocks = ToolUtil.GetSurroundingBlocks(blockFace, block); ArrayList<Block> blocks = ToolUtil.GetSurroundingBlocks(blockFace, block, item);
// Grab durability information // Grab durability information
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();

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

@ -129,9 +129,10 @@ public class ToolUtil
* Grabs the surrounding blocks in the world from the one that was mined/dug, and adds them to a list * Grabs the surrounding blocks in the world from the one that was mined/dug, and adds them to a list
* @param blockFace The face that was targeted (changes the direction of the 3x3 grid) * @param blockFace The face that was targeted (changes the direction of the 3x3 grid)
* @param target The block that was targeted * @param target The block that was targeted
* @param tool The tool that was used
* @return A list containing the surrounding blocks * @return A list containing the surrounding blocks
*/ */
public static ArrayList<Block> GetSurroundingBlocks(BlockFace blockFace, Block target) public static ArrayList<Block> GetSurroundingBlocks(BlockFace blockFace, Block target, ItemStack tool)
{ {
// Create the list to work with // Create the list to work with
ArrayList<Block> blocks = new ArrayList<Block>(); ArrayList<Block> blocks = new ArrayList<Block>();
@ -154,7 +155,7 @@ public class ToolUtil
for (int worldZ = -1; worldZ <= 1; worldZ++) for (int worldZ = -1; worldZ <= 1; worldZ++)
{ {
Block b = world.getBlockAt(x + worldX, y, z + worldZ); Block b = world.getBlockAt(x + worldX, y, z + worldZ);
if (BlockRef.ValidExcavatorBlocks.contains(b.getType()) || BlockRef.ValidHammerBlocks.contains(b.getType())) if (IsHammerable(tool, b.getType()) || IsExcavatable(tool, b.getType()))
{ {
blocks.add(b); blocks.add(b);
} }
@ -169,7 +170,7 @@ public class ToolUtil
for (int worldZ = -1; worldZ <= 1; worldZ++) for (int worldZ = -1; worldZ <= 1; worldZ++)
{ {
Block b = world.getBlockAt(x, y + worldY, z + worldZ); Block b = world.getBlockAt(x, y + worldY, z + worldZ);
if (BlockRef.ValidExcavatorBlocks.contains(b.getType()) || BlockRef.ValidHammerBlocks.contains(b.getType())) if (IsHammerable(tool, b.getType()) || IsExcavatable(tool, b.getType()))
{ {
blocks.add(b); blocks.add(b);
} }
@ -184,7 +185,7 @@ public class ToolUtil
for (int worldY = -1; worldY <= 1; worldY++) for (int worldY = -1; worldY <= 1; worldY++)
{ {
Block b = world.getBlockAt(x + worldX, y + worldY, z); Block b = world.getBlockAt(x + worldX, y + worldY, z);
if (BlockRef.ValidExcavatorBlocks.contains(b.getType()) || BlockRef.ValidHammerBlocks.contains(b.getType())) if (IsHammerable(tool, b.getType()) || IsExcavatable(tool, b.getType()))
{ {
blocks.add(b); blocks.add(b);
} }