forked from SteamWar/SteamWar
Fixes...
This commit is contained in:
@@ -77,7 +77,7 @@ public class ErrorHandler extends Handler {
|
||||
return;
|
||||
|
||||
try {
|
||||
//SWException.log(message, stacktrace);
|
||||
SWException.log(message, stacktrace);
|
||||
} catch (SecurityException e) {
|
||||
Core.getInstance().getLogger().log(Level.INFO, "Could not log error in database", e);
|
||||
}
|
||||
|
||||
@@ -22,10 +22,8 @@ package de.steamwar.core;
|
||||
import com.sk89q.worldedit.EmptyClipboardException;
|
||||
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
|
||||
import com.sk89q.worldedit.session.ClipboardHolder;
|
||||
import de.steamwar.sql.NoClipboardException;
|
||||
import org.apache.logging.log4j.util.TriConsumer;
|
||||
import com.sk89q.worldedit.math.transform.Transform;
|
||||
import com.sk89q.worldedit.regions.Region;
|
||||
import org.bukkit.Bukkit;
|
||||
@@ -51,7 +49,7 @@ public interface WorldEditWrapper {
|
||||
return (WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit");
|
||||
}
|
||||
|
||||
public static InputStream getPlayerClipboard(Player player, boolean schemFormat, TriConsumer<OutputStream, Clipboard, ClipboardHolder> consumer) {
|
||||
public static InputStream getPlayerClipboard(Player player, boolean schemFormat, SchematicWriter consumer) {
|
||||
ClipboardHolder clipboardHolder;
|
||||
try {
|
||||
clipboardHolder = WorldEditWrapper.getWorldEditPlugin().getSession(player).getClipboard();
|
||||
@@ -73,7 +71,7 @@ public interface WorldEditWrapper {
|
||||
|
||||
new Thread(() -> {
|
||||
try {
|
||||
consumer.accept(outputStream, clipboard, clipboardHolder);
|
||||
consumer.write(outputStream, clipboard, clipboardHolder);
|
||||
} catch (Exception e) {
|
||||
Core.getInstance().getLogger().log(Level.SEVERE, "Could not write schematic", e);
|
||||
}
|
||||
@@ -86,4 +84,8 @@ public interface WorldEditWrapper {
|
||||
|
||||
return inputStream;
|
||||
}
|
||||
|
||||
public static interface SchematicWriter {
|
||||
void write(OutputStream outputStream, Clipboard clipboard, ClipboardHolder holder) throws IOException;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user