From 9060bfa9b969a97399f14ab4dbb3aebe61d4a9fc Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 8 Apr 2018 20:03:12 +1000 Subject: SPIGOT-3886: Plugin exceptions in map rendering should not crash server --- src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java | 1 + src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java index 1c3e1981..7372614c 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java +++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapCanvas.java @@ -93,6 +93,7 @@ public class CraftMapCanvas implements MapCanvas { } catch (NumberFormatException ex) {} } + throw new IllegalArgumentException("Text contains unterminated color string"); } CharacterSprite sprite = font.getChar(text.charAt(i)); diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java index 625ef96b..b951bfda 100644 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java +++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Level; import net.minecraft.server.WorldMap; @@ -143,7 +144,11 @@ public final class CraftMapView implements MapView { } canvas.setBase(render.buffer); - renderer.render(this, canvas, player); + try { + renderer.render(this, canvas, player); + } catch (Throwable ex) { + Bukkit.getLogger().log(Level.SEVERE, "Could not render map using renderer " + renderer.getClass().getName(), ex); + } byte[] buf = canvas.getBuffer(); for (int i = 0; i < buf.length; ++i) { -- cgit v1.2.3