From a38cd099f2a7c52e250119c4c09d6591f6013212 Mon Sep 17 00:00:00 2001 From: ch-yx Date: Thu, 21 Jul 2022 21:15:30 +0800 Subject: [PATCH] One-line fix for a minor bug about encoding (#1368) --- src/main/java/carpet/script/language/DataStructures.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/script/language/DataStructures.java b/src/main/java/carpet/script/language/DataStructures.java index 6e03eb9e..81a1c393 100644 --- a/src/main/java/carpet/script/language/DataStructures.java +++ b/src/main/java/carpet/script/language/DataStructures.java @@ -329,10 +329,10 @@ public class DataStructures { return (cc, tt) -> ret; }); - expression.addUnaryFunction("encode_b64", v -> StringValue.of(Base64.getEncoder().encodeToString(v.getString().getBytes()))); + expression.addUnaryFunction("encode_b64", v -> StringValue.of(Base64.getEncoder().encodeToString(v.getString().getBytes(StandardCharsets.UTF_8)))); expression.addUnaryFunction("decode_b64", v -> { try { - return StringValue.of(new String(Base64.getDecoder().decode(v.getString()), StandardCharsets.ISO_8859_1));//using this charset cos it's the one used in decoding function + return StringValue.of(new String(Base64.getDecoder().decode(v.getString()), StandardCharsets.UTF_8)); } catch (IllegalArgumentException iae){ throw new ThrowStatement("Invalid b64 string: " + v.getString(), Throwables.B64_ERROR); }