Upstream/CoreProtect
1
0
Fork 0
mirror of https://github.com/PlayPro/CoreProtect.git synced 2025-02-18 02:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change first argument of containerTransactionsLookup to Location

Browse Source
This commit is contained in:
takejohn 2023-12-31 19:26:05 +09:00
parent a58d764075
commit 1540fecf93
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/coreprotect/CoreProtectAPI.java
View File

@ -216,9 +216,9 @@ public class CoreProtectAPI extends Queue {
return null;
}
public List<String[]> containerTransactionsLookup(Block block, int time) {
public List<String[]> containerTransactionsLookup(Location location, int time) {
if (Config.getGlobal().API_ENABLED) {
return ContainerTransactionsAPI.performLookup(block, time);
return ContainerTransactionsAPI.performLookup(location, time);
}
return null;
}

27
src/main/java/net/coreprotect/api/ContainerTransactionsAPI.java
View File

@ -1,12 +1,5 @@
package net.coreprotect.api;
import net.coreprotect.CoreProtect;
import net.coreprotect.config.ConfigHandler;
import net.coreprotect.database.Database;
import net.coreprotect.database.statement.UserStatement;
import net.coreprotect.utility.Util;
import org.bukkit.block.Block;
import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.sql.ResultSet;
@ -16,6 +9,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import org.bukkit.Location;
import net.coreprotect.CoreProtect;
import net.coreprotect.config.ConfigHandler;
import net.coreprotect.database.Database;
import net.coreprotect.database.statement.UserStatement;
import net.coreprotect.utility.Util;
public final class ContainerTransactionsAPI {
private static final int CONNECTION_WAIT_TIME = 1000;
@ -24,19 +25,19 @@ public final class ContainerTransactionsAPI {
throw new AssertionError();
}
public static List<String[]> performLookup(Block block, int offset) {
public static List<String[]> performLookup(Location location, int offset) {
List<String[]> result = new ArrayList<>();
if (block == null) {
if (location == null) {
return result;
}
try (Connection connection = Database.getConnection(false, CONNECTION_WAIT_TIME)) {
final int x = block.getX();
final int y = block.getY();
final int z = block.getZ();
final int x = (int) location.getX();
final int y = (int) location.getY();
final int z = (int) location.getZ();
final int now = (int) (System.currentTimeMillis() / 1000L);
final int worldId = Util.getWorldId(block.getWorld().getName());
final int worldId = Util.getWorldId(location.getWorld().getName());
final int timeFrom = offset > 0 ? now - offset : 0;
if (connection == null) {