Goldenwere/GibsoniaCraft
Archived
1
0
Fork 0
Code Activity

fixed hammer not being initialized in onEnable, fixed method signature to match event type in blocklistener, fixed conditional always being entered and thus failing tool-check

Browse source
This commit is contained in:
lightling 2019-09-13 15:27:37 -04:00
parent babf7e66a3
commit 747efa0ed3
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugin/src/lightling/gibsoniacraft/GibsoniaCraft.java
View file

@ -3,18 +3,21 @@ package lightling.gibsoniacraft;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import lightling.gibsoniacraft.crafting.Excavator; import lightling.gibsoniacraft.crafting.Excavator;
import lightling.gibsoniacraft.crafting.Hammer;
import lightling.gibsoniacraft.util.BlockListener; import lightling.gibsoniacraft.util.BlockListener;
import lightling.gibsoniacraft.util.PlayerInteractListener; import lightling.gibsoniacraft.util.PlayerInteractListener;
public final class GibsoniaCraft extends JavaPlugin { public final class GibsoniaCraft extends JavaPlugin {
private Excavator excavatorClass; private Excavator excavatorClass;
private Hammer hammerClass;
private PlayerInteractListener pListener; private PlayerInteractListener pListener;
private BlockListener bListener; private BlockListener bListener;
@Override @Override
public void onEnable() { public void onEnable() {
excavatorClass = new Excavator(this); excavatorClass = new Excavator(this);
hammerClass = new Hammer(this);
pListener = new PlayerInteractListener(this); pListener = new PlayerInteractListener(this);
bListener = new BlockListener(this); bListener = new BlockListener(this);
} }

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

@ -26,13 +26,15 @@ import org.bukkit.enchantments.Enchantment;
*/ */
public class BlockListener implements Listener public class BlockListener implements Listener
{ {
GibsoniaCraft gcPlugin;
public BlockListener(GibsoniaCraft plugin) public BlockListener(GibsoniaCraft plugin)
{ {
plugin.getServer().getPluginManager().registerEvents(this, plugin); gcPlugin = plugin;
gcPlugin.getServer().getPluginManager().registerEvents(this, gcPlugin);
} }
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void Break(GibsoniaCraft plugin, BlockBreakEvent bbEvent) public void Break(BlockBreakEvent bbEvent)
{ {
// Grab current tool information // Grab current tool information
Player player = bbEvent.getPlayer(); Player player = bbEvent.getPlayer();
@ -43,15 +45,19 @@ public class BlockListener implements Listener
if (player != null && (player instanceof Player)) if (player != null && (player instanceof Player))
{ {
if (player.isSneaking()) if (player.isSneaking())
{
return; return;
if (!ToolUtil.IsExcavator(itemType) || !ToolUtil.IsHammer(itemType)) }
return; if (!ToolUtil.IsExcavator(itemType) && !ToolUtil.IsHammer(itemType))
{
return;
}
} }
// Get blockface information via the player listener // Get blockface information via the player listener
Block block = bbEvent.getBlock(); Block block = bbEvent.getBlock();
String pName = player.getName(); String pName = player.getName();
PlayerInteractListener pListener = plugin.GetPlayerInteractListener(); PlayerInteractListener pListener = gcPlugin.GetPlayerInteractListener();
BlockFace blockFace = pListener.GetFaceByName(pName); BlockFace blockFace = pListener.GetFaceByName(pName);
// getDurability deprecated, must now go through meta information // getDurability deprecated, must now go through meta information