From 562594de2ff89cc4d2d49540f6831a5b05112540 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Sun, 9 Jun 2024 22:01:30 +0500 Subject: [PATCH] Better error on invalid dimension --- .../seibel/distanthorizons/core/level/DhServerLevel.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java index c7cf2c277..6ba296c56 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java @@ -176,7 +176,7 @@ public class DhServerLevel extends AbstractDhLevel implements IDhServerLevel { return msg -> { - LodUtil.assertTrue(msg instanceof ILevelRelatedMessage, "Received message does not implement " + ILevelRelatedMessage.class.getSimpleName() + ": " + msg.getClass().getSimpleName()); + LodUtil.assertTrue(msg instanceof ILevelRelatedMessage, MessageFormat.format("Received message does not implement {0}: {1}", ILevelRelatedMessage.class.getSimpleName(), msg.getClass().getSimpleName())); // Handle only in requested dimension if (!((ILevelRelatedMessage) msg).isSameLevelAs(this.getLevelWrapper())) @@ -192,9 +192,10 @@ public class DhServerLevel extends AbstractDhLevel implements IDhServerLevel if (msg instanceof TrackableMessage) { ((TrackableMessage) msg).sendResponse(new InvalidLevelException(MessageFormat.format( - "Generation not allowed. Requested dimension: {0}, player dimension: {1}", - this.getLevelWrapper().getDimensionType().getDimensionName(), - msg.session.serverPlayer.getLevel().getDimensionType().getDimensionName() + "Generation not allowed. Requested dimension: {0}, player dimension: {1}, handler dimension: {2}", + ((ILevelRelatedMessage) msg).getLevelName(), + msg.session.serverPlayer.getLevel().getDimensionType().getDimensionName(), + this.getLevelWrapper().getDimensionType().getDimensionName() ))); }