From 6db70e605835c6f4a7f31f08e5758c126fae2124 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 7 Oct 2017 18:30:07 +1100
Subject: [PATCH] Revert to old leveldb dependency

---
 .../com/boydti/fawe/jnbt/anvil/MCAQueue.java    |  1 +
 .../nukkit/core/converter/ConverterFrame.java   | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAQueue.java b/core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAQueue.java
index ac1d8dc3..891df6e4 100644
--- a/core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAQueue.java
+++ b/core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAQueue.java
@@ -502,6 +502,7 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
                     final int mcaZ = Integer.parseInt(split[2]);
                     if (filter.appliesFile(mcaX, mcaZ)) {
                         File file = path.toFile();
+                        Fawe.debug("Apply file: " + file.getName());
                         final MCAFile original = new MCAFile(MCAQueue.this, file);
                         final MCAFile finalFile = filter.applyFile(original);
                         if (finalFile != null && !finalFile.isDeleted()) {
diff --git a/nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/ConverterFrame.java b/nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/ConverterFrame.java
index 606c2489..3b0d3724 100644
--- a/nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/ConverterFrame.java
+++ b/nukkit/src/main/java/com/boydti/fawe/nukkit/core/converter/ConverterFrame.java
@@ -326,11 +326,22 @@ public class ConverterFrame extends JFrame {
                     debug("Loading leveldb.jar");
 
                     File lib = new File("lib");
-                    File leveldb = new File(lib, "leveldb.jar");
+
+                    File leveldb;
+                    URL levelDbUrl;
+
+                    if (new File(dirMc, "db").exists()) {
+                        leveldb = new File(lib, "leveldb.jar");
+                        levelDbUrl = new URL("https://git.io/vdZ9e");
+                    } else {
+                        leveldb = new File(lib, "leveldb-nukkit.jar");
+                        levelDbUrl = new URL("https://github.com/Nukkit/Nukkit/raw/master/lib/leveldb.jar");
+                    }
+
+
 //                    File blocksPE = new File(lib, "blocks-pe.json");
 //                    File blocksPC = new File(lib, "blocks-pc.json");
 
-                    URL levelDbUrl = new URL("https://git.io/vdZ9e");
 //                    URL urlPE = new URL("https://git.io/vdZSj");
 //                    URL urlPC = new URL("https://git.io/vdZSx");
 
@@ -342,6 +353,8 @@ public class ConverterFrame extends JFrame {
 
                     File newWorldFile = new File(output, dirMc.getName());
 
+                    debug("Starting converter...");
+
                     MapConverter converter = MapConverter.get(dirMc, newWorldFile);
                     converter.accept(ConverterFrame.this);
                 } catch (Throwable e) {