Skip to content

actually fix block action logging (Closes #917) #922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guss-alberto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

actually fix block action logging (Closes #917) #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/main/java/net/coreprotect/database/logger/BlockBreakLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import net.coreprotect.utility.BlockTypeUtils;
import net.coreprotect.utility.WorldUtils;
import net.coreprotect.utility.ErrorReporter;
import net.coreprotect.utility.MaterialUtils;

public class BlockBreakLogger {

Expand Down Expand Up @@ -54,6 +55,16 @@ else if (checkType != null && (checkType.equals(Material.AIR) || checkType.equal
CacheHandler.spreadCache.remove(cacheId);
}


if (checkType != null && blockKey.length() > 0) {
Material blockDataType = MaterialUtils.getType(blockKey);
if (blockDataType != null && !blockDataType.equals(type)) {
blockKey = checkType.getKey().toString();
blockData = null;
}
}


if (checkType == Material.LECTERN) {
blockData = blockData.replaceFirst("has_book=true", "has_book=false");
}
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/net/coreprotect/database/logger/BlockPlaceLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ else if (forceType != null && (type == null || !type.equals(forceType))) {
type = forceType;
data = forceData;
}

if (forceType != null && type != null && blockKey.length() > 0) {
Material blockDataType = MaterialUtils.getType(blockKey);
if (blockDataType != null && !blockDataType.equals(type)) {
blockKey = type.getKey().toString();
blockData = null;
}
}

if (blockKey.length() == 0) {
if (type == null) {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/coreprotect/database/logger/PlayerInteractLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private PlayerInteractLogger() {

public static void log(PreparedStatement preparedStmt, int batchCount, String user, BlockState block, Material blockType) {
try {
String blockData = block.getBlockData().getAsString();
String blockData = blockType == null ? block.getBlockData().getAsString() : blockType.toString();
String blockKey = BlockTypeUtils.getBlockDataKey(blockData);
if (blockKey.length() == 0 && blockType != null) {
blockKey = blockType.getKey().toString();
Expand Down