From 7a365763b11e39df8eac861c4ca5043e974a1971 Mon Sep 17 00:00:00 2001 From: JOO200 Date: Sat, 5 Mar 2022 19:56:54 +0100 Subject: [PATCH] Fix Migration for messages without color codes --- .../java/com/sk89q/worldguard/bukkit/util/MiniMessageUtil.java | 2 +- .../protection/managers/migration/ComponentFlagMigration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/MiniMessageUtil.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/MiniMessageUtil.java index 37e645069..3dad81d77 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/MiniMessageUtil.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/MiniMessageUtil.java @@ -67,6 +67,6 @@ public static String legacyToMiniMessage(String message) { TextComponent deserialize = LegacyComponentSerializer.legacySection().deserialize(message); return MiniMessage.miniMessage().serialize(deserialize); } - return null; + return message; } } diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/ComponentFlagMigration.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/ComponentFlagMigration.java index 86c103bd5..57956eb39 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/ComponentFlagMigration.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/ComponentFlagMigration.java @@ -85,7 +85,7 @@ protected void migrate(RegionDatabase store) throws MigrationException { String val = region.getFlag(replaceFlag); if (val != null) { String migration = migrateToMinimessage(val); - if (migration != null) { + if (!val.equals(migration)) { region.setFlag(replaceFlag, migration); changed++; }