From a20ccf0c1ea3ce8c70111367ab6d10a1600664b9 Mon Sep 17 00:00:00 2001
From: Fabrizio La Rosa <lr.fabrizio@gmail.com>
Date: Tue, 14 Jul 2020 10:24:24 +0200
Subject: [PATCH 1/3] Fix npe in getMaterial on older versions

---
 .../com/songoda/core/compatibility/CompatibleMaterial.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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..e124a6c6 100644
--- a/Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
+++ b/Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
@@ -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;
                             }

From 33e35cbcc31f0b8c25abfebb9bbf404ef8d0e109 Mon Sep 17 00:00:00 2001
From: Fabrizio La Rosa <lr.fabrizio@gmail.com>
Date: Tue, 14 Jul 2020 19:08:45 +0200
Subject: [PATCH 2/3] ANCIENT_DEBRIS not ANCIENT_DEBRIES!

---
 .../java/com/songoda/core/compatibility/CompatibleMaterial.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e124a6c6..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(),

From 3e94e225a557bac0a48d2e75df3490d9c5f2a20c Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Thu, 30 Jul 2020 07:36:30 -0500
Subject: [PATCH 3/3] version 2.3.46

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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