Fixed MySQL warnings when logging paintings on MC 1.21+ (fixes #829)

This commit is contained in:
Intelli committed 2026-04-22 17:47:32 -06:00
1 parent b83b39feae
commit 6c04867eb8
4 files changed
+13 -3

No files matched your search

@@ -145,7 +145,7 @@ public final class HangingBreakByEntityListener extends Queue implements Listene
Painting painting = (Painting) entity; Painting painting = (Painting) entity;
blockData = "FACING=" + painting.getFacing().name(); blockData = "FACING=" + painting.getFacing().name();
try { try {
itemData = MaterialUtils.getArtId(painting.getArt().toString(), true); itemData = MaterialUtils.getArtId(MaterialUtils.getPaintingArtName(painting), true);
} }
catch (IncompatibleClassChangeError e) { catch (IncompatibleClassChangeError e) {
// 1.21.2+ // 1.21.2+
@@ -73,7 +73,7 @@ public final class HangingBreakListener extends Queue implements Listener {
Painting painting = (Painting) entity; Painting painting = (Painting) entity;
blockData = "FACING=" + painting.getFacing().name(); blockData = "FACING=" + painting.getFacing().name();
try { try {
itemData = MaterialUtils.getArtId(painting.getArt().toString(), true); itemData = MaterialUtils.getArtId(MaterialUtils.getPaintingArtName(painting), true);
} }
catch (IncompatibleClassChangeError e) { catch (IncompatibleClassChangeError e) {
// 1.21.2+ // 1.21.2+
@@ -41,7 +41,7 @@ public final class HangingPlaceListener extends Queue implements Listener {
Painting painting = (Painting) entity; Painting painting = (Painting) entity;
blockData = "FACING=" + painting.getFacing().name(); blockData = "FACING=" + painting.getFacing().name();
try { try {
artId = MaterialUtils.getArtId(painting.getArt().toString(), true); artId = MaterialUtils.getArtId(MaterialUtils.getPaintingArtName(painting), true);
} }
catch (IncompatibleClassChangeError e) { catch (IncompatibleClassChangeError e) {
artId = 0; artId = 0;
@@ -4,6 +4,7 @@ import java.util.Locale;
import java.util.Set; import java.util.Set;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Painting;
import net.coreprotect.config.ConfigHandler; import net.coreprotect.config.ConfigHandler;
import net.coreprotect.consumer.Queue; import net.coreprotect.consumer.Queue;
@@ -164,6 +165,15 @@ public class MaterialUtils extends Queue {
return id; return id;
} }
public static String getPaintingArtName(Painting painting) {
try {
return painting.getArt().name();
}
catch (IncompatibleClassChangeError e) {
return painting.getArt().toString();
}
}
public static String getArtName(int id) { public static String getArtName(int id) {
// Internal ID pulled from DB // Internal ID pulled from DB
String artname = ""; String artname = "";