Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error message during warp sign creation #5956

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Fix error message during warp sign creation #5956

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50b5f06
Fix error message during warp sign creation
JRoy Oct 20, 2024
54e3279
Merge branch '2.x' into fix/5954
JRoy Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/signs/SignWarp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import net.ess3.api.IEssentials;
import net.ess3.api.TranslatableException;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

import java.util.concurrent.CompletableFuture;
Expand All @@ -25,6 +26,10 @@ protected boolean onSignCreate(final ISign sign, final User player, final String
try {
ess.getWarps().getWarp(warpName);
} catch (final Exception ex) {
if (ex instanceof TranslatableException) {
final TranslatableException te = (TranslatableException) ex;
throw new SignException(ex, te.getTlKey(), te.getArgs());
}
throw new SignException(ex, "errorWithMessage", ex.getMessage());
}
final String group = sign.getLine(2);
Expand Down
Loading