From 7704ec5cd4500f6c4252b57f8ddf5767fdd3c920 Mon Sep 17 00:00:00 2001 From: N0tMyFaultOG Date: Sat, 1 Aug 2020 13:52:54 +0200 Subject: [PATCH] Fix paste service interacting with EH's paste service We need to differ here between our own and EH or we break pastes from WorldGuard or any other EH software. --- .../java/com/sk89q/worldedit/command/WorldEditCommands.java | 3 +-- .../com/sk89q/worldedit/util/paste/ActorCallbackPaste.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java index 1d221846f..d20132225 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java @@ -132,8 +132,7 @@ public class WorldEditCommands { } @Command( - name = "report", - aliases = { "debugpaste" }, + name = "debugpaste", desc = "Writes a report of latest.log, config.yml, message.yml https://athion.net/ISPaster/paste" ) @CommandPermissions(value = {"worldedit.report", "worldedit.debugpaste"}, queued = false) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java index 8c28774a9..a0d677e74 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java @@ -19,7 +19,6 @@ package com.sk89q.worldedit.util.paste; -import com.boydti.fawe.util.IncendoPaster; import com.sk89q.worldedit.command.util.AsyncCommandBuilder; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.util.formatting.text.TextComponent; @@ -31,7 +30,7 @@ import java.util.concurrent.Callable; public final class ActorCallbackPaste { - private static final Paster paster = new IncendoPaster("fastasyncworldedit"); + private static final Paster paster = new EngineHubPaste(); private ActorCallbackPaste() { }