Upstream/EpicFurnaces
1
0
Fork 0
mirror of https://github.com/songoda/EpicFurnaces.git synced 2024-12-03 15:23:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
songoda 2019-09-20 11:52:03 -04:00
commit a1defd76cc
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/songoda/epicfurnaces/furnace/Furnace.java
View File

@ -53,7 +53,7 @@ public class Furnace {
public void plus(FurnaceSmeltEvent e) { public void plus(FurnaceSmeltEvent e) {
Block block = location.getBlock(); Block block = location.getBlock();
if (!block.getType().name().contains("FURNACE")) return; if (!block.getType().name().contains("FURNACE") && !block.getType().name().contains("SMOKER")) return;
this.uses++; this.uses++;
this.tolevel++; this.tolevel++;
@ -180,7 +180,7 @@ public class Furnace {
public void updateCook() { public void updateCook() {
Block block = location.getBlock(); Block block = location.getBlock();
if (!block.getType().name().contains("FURNACE")) return; if (!block.getType().name().contains("FURNACE") && !block.getType().name().contains("SMOKER")) return;
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> { Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> {
int num = getPerformanceTotal(); int num = getPerformanceTotal();

4
src/main/java/com/songoda/epicfurnaces/listeners/BlockListeners.java
View File

@ -48,7 +48,7 @@ public class BlockListeners implements Listener {
public void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
if (plugin.getBlacklistHandler().isBlacklisted(event.getPlayer().getWorld()) if (plugin.getBlacklistHandler().isBlacklisted(event.getPlayer().getWorld())
|| !event.getBlock().getType().name().contains("FURNACE")) || !event.getBlock().getType().name().contains("FURNACE") && !event.getBlock().getType().name().contains("SMOKER"))
return; return;
ItemStack item = event.getItemInHand(); ItemStack item = event.getItemInHand();
@ -73,7 +73,7 @@ public class BlockListeners implements Listener {
return; return;
} }
Block block = event.getBlock(); Block block = event.getBlock();
if (!block.getType().name().contains("FURNACE") if (!block.getType().name().contains("FURNACE") && !block.getType().name().contains("SMOKER")
|| plugin.getBlacklistHandler().isBlacklisted(event.getPlayer().getWorld())) || plugin.getBlacklistHandler().isBlacklisted(event.getPlayer().getWorld()))
return; return;

2
src/main/java/com/songoda/epicfurnaces/listeners/InteractListeners.java
View File

@ -33,7 +33,7 @@ public class InteractListeners implements Listener {
} }
Player player = event.getPlayer(); Player player = event.getPlayer();
if (event.getAction() != Action.LEFT_CLICK_BLOCK if (event.getAction() != Action.LEFT_CLICK_BLOCK
|| (!block.getType().name().contains("FURNACE")) || !block.getType().name().contains("FURNACE") && !block.getType().name().contains("SMOKER")
|| player.isSneaking() || player.isSneaking()
|| player.getInventory().getItemInHand().getType().name().contains("PICKAXE") || player.getInventory().getItemInHand().getType().name().contains("PICKAXE")
|| !player.hasPermission("EpicFurnaces.overview")) { || !player.hasPermission("EpicFurnaces.overview")) {

2
src/main/java/com/songoda/epicfurnaces/listeners/InventoryListeners.java
View File

@ -38,7 +38,7 @@ public class InventoryListeners implements Listener {
if (event.getAction() != InventoryAction.NOTHING) { if (event.getAction() != InventoryAction.NOTHING) {
if (event.getCurrentItem().getType() != Material.AIR) { if (event.getCurrentItem().getType() != Material.AIR) {
ItemStack item = event.getCurrentItem(); ItemStack item = event.getCurrentItem();
if (item.getType().name().contains("FURNACE")) { if (item.getType().name().contains("FURNACE") && !item.getType().name().contains("SMOKER")) {
event.setCancelled(true); event.setCancelled(true);
} }
} }

2
src/main/java/com/songoda/epicfurnaces/tasks/FurnaceTask.java
View File

@ -105,7 +105,7 @@ public class FurnaceTask extends BukkitRunnable {
Block block = location.getBlock(); Block block = location.getBlock();
if (!block.getType().name().contains("FURNACE")) continue; if (!block.getType().name().contains("FURNACE") && !block.getType().name().contains("SMOKER")) continue;
Furnace furnace1 = plugin.getFurnaceManager().getFurnace(block); Furnace furnace1 = plugin.getFurnaceManager().getFurnace(block);
if (furnace == furnace1) continue; if (furnace == furnace1) continue;
org.bukkit.block.Furnace furnaceBlock = ((org.bukkit.block.Furnace) block.getState()); org.bukkit.block.Furnace furnaceBlock = ((org.bukkit.block.Furnace) block.getState());