From c8b49ae7efc8d031e79dc0c991dfa0badb606e21 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sun, 12 Jan 2020 18:52:51 +0100 Subject: [PATCH] Trying fixing failing schem saving --- SpigotCore_14/pom.xml | 6 ------ SpigotCore_14/src/de/steamwar/sql/Schematic_14.java | 10 +++------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/SpigotCore_14/pom.xml b/SpigotCore_14/pom.xml index 513b8b6..f9886be 100644 --- a/SpigotCore_14/pom.xml +++ b/SpigotCore_14/pom.xml @@ -45,11 +45,5 @@ 2.0 compile - - steamwar - SpigotCore_12 - 2.0 - compile - \ No newline at end of file diff --git a/SpigotCore_14/src/de/steamwar/sql/Schematic_14.java b/SpigotCore_14/src/de/steamwar/sql/Schematic_14.java index e6f739c..958bf8a 100644 --- a/SpigotCore_14/src/de/steamwar/sql/Schematic_14.java +++ b/SpigotCore_14/src/de/steamwar/sql/Schematic_14.java @@ -4,8 +4,8 @@ import com.sk89q.worldedit.EmptyClipboardException; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extent.clipboard.Clipboard; +import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat; import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat; -import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats; import com.sk89q.worldedit.session.ClipboardHolder; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -17,8 +17,8 @@ import java.io.InputStream; class Schematic_14 { private Schematic_14(){} - private static final ClipboardFormat SCHEMATIC = ClipboardFormats.findByAlias("schematic"); - private static final ClipboardFormat SCHEM = ClipboardFormats.findByAlias("schem"); + private static final ClipboardFormat SCHEMATIC = BuiltInClipboardFormat.MCEDIT_SCHEMATIC; + private static final ClipboardFormat SCHEM = BuiltInClipboardFormat.SPONGE_SCHEMATIC; static byte[] getPlayerClipboard(Player player, boolean schemFormat) throws IOException, NoClipboardException { ClipboardHolder clipboardHolder; @@ -35,10 +35,8 @@ class Schematic_14 { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); try{ if(schemFormat){ - assert SCHEM != null; SCHEM.getWriter(outputStream).write(clipboard); }else{ - assert SCHEMATIC != null; SCHEMATIC.getWriter(outputStream).write(clipboard); } }catch(NullPointerException e){ @@ -60,10 +58,8 @@ class Schematic_14 { static Clipboard getClipboard(InputStream is, boolean schemFormat) throws IOException, NoClipboardException { try { if(schemFormat){ - assert SCHEM != null; return SCHEM.getReader(is).read(); }else{ - assert SCHEMATIC != null; return SCHEMATIC.getReader(is).read(); } } catch (NullPointerException e) {