From a0ef151341016b3ae9e024dc777f0330a922bab9 Mon Sep 17 00:00:00 2001
From: Pierre Maurice Schwang <mail@pschwang.eu>
Date: Fri, 12 Apr 2024 20:55:40 +0200
Subject: [PATCH] Fix heightmap brush with imgur images (#2680)

fix: heightmap brush with imgur / remote images
---
 .../core/util/MainUtil.java                   | 20 +++++++++++--------
 .../core/util/image/ImageUtil.java            |  6 +++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java
index 41c4e5704..1c5fe044a 100644
--- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java
+++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MainUtil.java
@@ -554,8 +554,15 @@ public class MainUtil {
     }
 
     public static BufferedImage readImage(URL url) throws IOException {
+        try (final InputStream stream = readImageStream(url.toURI())) {
+            return readImage(stream);
+        } catch (URISyntaxException e) {
+            throw new IOException("failed to parse url to uri reference", e);
+        }
+    }
+
+    public static InputStream readImageStream(final URI uri) throws IOException {
         try {
-            final URI uri = url.toURI();
             HttpRequest.Builder requestBuilder = HttpRequest.newBuilder(uri).GET();
 
             if (uri.getHost().equalsIgnoreCase("i.imgur.com")) {
@@ -566,16 +573,13 @@ public class MainUtil {
                     requestBuilder.build(),
                     HttpResponse.BodyHandlers.ofInputStream()
             );
-            try (final InputStream body = response.body()) {
-                if (response.statusCode() > 299) {
-                    throw new IOException("Expected 2xx as response code, but received " + response.statusCode());
-                }
-                return readImage(body);
+            final InputStream body = response.body();
+            if (response.statusCode() > 299) {
+                throw new IOException("Expected 2xx as response code, but received " + response.statusCode());
             }
+            return body;
         } catch (InterruptedException e) {
             throw new IOException("request was interrupted", e);
-        } catch (URISyntaxException e) {
-            throw new IOException("failed to parse url to uri reference", e);
         }
     }
 
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/image/ImageUtil.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/image/ImageUtil.java
index f99a17e6f..c7c8edda3 100644
--- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/image/ImageUtil.java
+++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/image/ImageUtil.java
@@ -176,8 +176,8 @@ public class ImageUtil {
     }
 
     public static BufferedImage load(URI uri) throws InputParseException {
-        try {
-            return MainUtil.readImage(getInputStream(uri));
+        try (final InputStream stream = getInputStream(uri)) {
+            return MainUtil.readImage(stream);
         } catch (IOException e) {
             throw new InputParseException(TextComponent.of(e.getMessage()));
         }
@@ -190,7 +190,7 @@ public class ImageUtil {
                 File file = new File(uri.getPath());
                 return new FileInputStream(file);
             }
-            return new URL(uriStr).openStream();
+            return MainUtil.readImageStream(uri);
         } catch (IOException e) {
             throw new InputParseException(TextComponent.of(e.getMessage()));
         }