diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44551ead..dc015ad7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: name: "SongodaCore" path: "/builds/$CI_PROJECT_PATH" - version: "2.3.45" + version: "2.3.46" build: stage: build diff --git a/Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java b/Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java index a3ef8a30..a8c39652 100644 --- a/Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java +++ b/Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java @@ -30,7 +30,7 @@ public enum CompatibleMaterial { */ /* 1.16 */ - ANCIENT_DEBRIES(), + ANCIENT_DEBRIS(), BASALT(), BLACKSTONE(), BLACKSTONE_STAIRS(), @@ -1356,10 +1356,10 @@ public enum CompatibleMaterial { if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { // Flattening return CompatibleMaterial.getMaterialFromNewBlock(block); } else { // Pre-Flattening - if(block != null){ + if(block != null) { if (block.getData() != 0) { for (CompatibleMaterial cm : CompatibleMaterial.values()) { - if (cm.getMaterial().equals(block.getType())) { + if (cm.isValidItem() && !cm.usesCompatibility() && cm.getMaterial() != null && cm.getMaterial().equals(block.getType())) { if (cm.getData() == block.getData()) { return cm; }