Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-02-12 18:31:32 +01:00
Code Issues Projects Releases Wiki Activity

Now the players can get income from grindstone when repairing

Browse Source
This commit is contained in:
montlikadani 2020-05-19 10:07:22 +02:00
parent 161706eb9d
commit b8fdad7c60
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1745,13 +1745,11 @@ public abstract class JobsDAO {
try {
prest = conn.prepareStatement("SELECT * FROM `" + DBTables.UsersTable.getTableName() + "`;");
res = prest.executeQuery();
List<String> uuids = new ArrayList<>();
while (res.next()) {
String uuid = res.getString(UserTableFields.player_uuid.getCollumn());
if (uuid == null || uuid.isEmpty()) {
PreparedStatement ps = conn.prepareStatement("DELETE FROM `" + DBTables.UsersTable.getTableName()
+ "` WHERE `" + UserTableFields.player_uuid.getCollumn() + "` = ?;");
ps.setString(1, uuid);
ps.execute();
uuids.add(uuid);
continue;
}
@ -1765,6 +1763,16 @@ public abstract class JobsDAO {
res.getInt(UserTableFields.donequests.getCollumn()),
res.getString(UserTableFields.quests.getCollumn())));
}
for (String u : uuids) {
PreparedStatement ps = conn.prepareStatement("DELETE FROM `" + DBTables.UsersTable.getTableName()
+ "` WHERE `" + UserTableFields.player_uuid.getCollumn() + "` = ?;");
ps.setString(1, u);
ps.execute();
close(ps);
}
uuids.clear();
} catch (SQLException e) {
e.printStackTrace();
} finally {

4
src/main/java/com/gamingmesh/jobs/listeners/JobsListener.java
View File

@ -86,9 +86,8 @@ import com.gamingmesh.jobs.container.JobsPlayer;
import com.gamingmesh.jobs.stuff.Util;
public class JobsListener implements Listener {
// hook to the main plugin
private Jobs plugin;
private Jobs plugin;
private HashMap<UUID, Long> interactDelay = new HashMap<>();
public JobsListener(Jobs plugin) {
@ -108,7 +107,6 @@ public class JobsListener implements Listener {
return;
final String msg = Util.getJobsEditorMap().remove(player.getUniqueId());
if (msg == null)
return;

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

@ -75,6 +75,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerShearEntityEvent;
import org.bukkit.inventory.AnvilInventory;
import org.bukkit.inventory.EnchantingInventory;
import org.bukkit.inventory.GrindstoneInventory;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.FixedMetadataValue;
@ -769,11 +770,9 @@ public class JobsPaymentListener implements Listener {
Inventory inv = event.getInventory();
// must be anvil inventory
if (!(inv instanceof AnvilInventory))
if (!(inv instanceof AnvilInventory) && !(inv instanceof GrindstoneInventory))
return;
// Must be "container" slot 9
if (!event.getSlotType().equals(SlotType.RESULT) || event.getSlot() != 2)
return;