Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-26 12:35:28 +01:00
Code Issues Projects Releases Wiki Activity

Another fix for total workers

Browse Source
This commit is contained in:
montlikadani 2020-03-28 19:14:18 +01:00
parent 825d2ecfdc
commit be9af51dc7
2 changed files with 53 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java
View File

@ -1179,8 +1179,8 @@ public abstract class JobsDAO {
prest = conn.prepareStatement("SELECT COUNT(*) FROM `" + getJobsTableName() + "` WHERE `" + JobsTableFields.job + "` = ?;");
prest.setString(1, JobName);
res = prest.executeQuery();
while (res.next()) {
count++;
if (res.next()) {
count += res.getInt(1);
}
if (count == 0) {
@ -1195,8 +1195,8 @@ public abstract class JobsDAO {
prest = conn.prepareStatement("SELECT COUNT(*) FROM `" + getJobsTableName() + "` WHERE `" + JobsTableFields.jobid + "` = ?;");
prest.setInt(1, job.getId());
res = prest.executeQuery();
while (res.next()) {
count++;
if (res.next()) {
count += res.getInt(1);
}
}
}

106
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -920,78 +920,70 @@ public class JobsPaymentListener implements Listener {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onInventoryMoveItemEventToFurnace(InventoryMoveItemEvent event) {
try {
if (!plugin.isEnabled())
return;
if (!plugin.isEnabled())
return;
if (!Jobs.getGCManager().PreventHopperFillUps)
return;
if (!Jobs.getGCManager().PreventHopperFillUps)
return;
String type = event.getDestination().getType().toString();
if (!type.equalsIgnoreCase("FURNACE") && !type.equalsIgnoreCase("SMOKER") && !type.equalsIgnoreCase("BLAST_FURNACE"))
return;
String type = event.getDestination().getType().toString();
if (!type.equalsIgnoreCase("FURNACE") && !type.equalsIgnoreCase("SMOKER") && !type.equalsIgnoreCase("BLAST_FURNACE"))
return;
if (event.getItem().getType() == Material.AIR)
return;
if (event.getItem().getType() == Material.AIR)
return;
Block block = null;
Block block = null;
switch (type.toLowerCase()) {
case "furnace":
block = ((Furnace) event.getDestination().getHolder()).getBlock();
break;
case "smoker":
// This should be done in this way to have backwards compatibility
block = ((org.bukkit.block.Smoker) event.getDestination().getHolder()).getBlock();
break;
case "blast_furnace":
// This should be done in this way to have backwards compatibility
block = ((org.bukkit.block.BlastFurnace) event.getDestination().getHolder()).getBlock();
break;
default:
break;
}
if (block == null)
return;
//disabling plugin in world
if (!Jobs.getGCManager().canPerformActionInWorld(block.getWorld()))
return;
if (block.hasMetadata(furnaceOwnerMetadata))
FurnaceBrewingHandling.removeFurnace(block);
} catch (Throwable e) {
e.printStackTrace();
switch (type.toLowerCase()) {
case "furnace":
block = ((Furnace) event.getDestination().getHolder()).getBlock();
break;
case "smoker":
// This should be done in this way to have backwards compatibility
block = ((org.bukkit.block.Smoker) event.getDestination().getHolder()).getBlock();
break;
case "blast_furnace":
// This should be done in this way to have backwards compatibility
block = ((org.bukkit.block.BlastFurnace) event.getDestination().getHolder()).getBlock();
break;
default:
break;
}
if (block == null)
return;
//disabling plugin in world
if (!Jobs.getGCManager().canPerformActionInWorld(block.getWorld()))
return;
if (block.hasMetadata(furnaceOwnerMetadata))
FurnaceBrewingHandling.removeFurnace(block);
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onInventoryMoveItemEventToBrewingStand(InventoryMoveItemEvent event) {
try {
if (!plugin.isEnabled())
return;
if (!plugin.isEnabled())
return;
if (event.getDestination().getType() != InventoryType.BREWING)
return;
if (event.getDestination().getType() != InventoryType.BREWING)
return;
if (!Jobs.getGCManager().PreventBrewingStandFillUps)
return;
if (!Jobs.getGCManager().PreventBrewingStandFillUps)
return;
if (event.getItem().getType() == Material.AIR)
return;
if (event.getItem().getType() == Material.AIR)
return;
BrewingStand stand = (BrewingStand) event.getDestination().getHolder();
//disabling plugin in world
if (!Jobs.getGCManager().canPerformActionInWorld(stand.getWorld()))
return;
BrewingStand stand = (BrewingStand) event.getDestination().getHolder();
//disabling plugin in world
if (!Jobs.getGCManager().canPerformActionInWorld(stand.getWorld()))
return;
Block block = stand.getBlock();
if (block.hasMetadata(brewingOwnerMetadata))
FurnaceBrewingHandling.removeBrewing(block);
} catch (Throwable e) {
e.printStackTrace();
}
Block block = stand.getBlock();
if (block.hasMetadata(brewingOwnerMetadata))
FurnaceBrewingHandling.removeBrewing(block);
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)