diff --git a/build.gradle b/build.gradle index a19ad4d..f097e51 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ apply plugin: 'org.spongepowered.mixin' //Build variables -version = "3.0.4" +version = "3.0.4.1" group = "de.erdbeerbaerlp.dcintegration" archivesBaseName = "dcintegration-forge" diff --git a/gradle.properties b/gradle.properties index 0abee51..7c1bb42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,6 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -changelog=More bug fixes\nImplement permissions +changelog=Fix death message custom embed releaseType = BETA mcVersion = 1.20.1 \ No newline at end of file diff --git a/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java b/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java index 0acb29b..4c3562e 100644 --- a/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java +++ b/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java @@ -534,8 +534,8 @@ public void death(LivingDeathEvent ev) { final MessageEmbed embed = ForgeMessageUtils.genItemStackEmbedIfAvailable(deathMessage); if (Configuration.instance().embedMode.enabled && Configuration.instance().embedMode.deathMessage.asEmbed) { final String avatarURL = Configuration.instance().webhook.playerAvatarURL.replace("%uuid%", ev.getEntity().getUUID().toString()).replace("%uuid_dashless%", ev.getEntity().getUUID().toString().replace("-", "")).replace("%name%", ev.getEntity().getName().getString()).replace("%randomUUID%", UUID.randomUUID().toString()); - if (!Configuration.instance().embedMode.playerJoinMessage.customJSON.isBlank()) { - final EmbedBuilder b = Configuration.instance().embedMode.playerJoinMessage.toEmbedJson(Configuration.instance().embedMode.playerJoinMessage.customJSON + if (!Configuration.instance().embedMode.deathMessage.customJSON.isBlank()) { + final EmbedBuilder b = Configuration.instance().embedMode.deathMessage.toEmbedJson(Configuration.instance().embedMode.deathMessage.customJSON .replace("%uuid%", ev.getEntity().getUUID().toString()) .replace("%uuid_dashless%", ev.getEntity().getUUID().toString().replace("-", "")) .replace("%name%", ForgeMessageUtils.formatPlayerName(ev.getEntity())) diff --git a/update_checker.json b/update_checker.json index 836db91..1d587f5 100644 --- a/update_checker.json +++ b/update_checker.json @@ -1,5 +1,9 @@ [ { + "version": "3.0.4.1", + "changelog": "Fix death message custom embed", + "type": "beta" + },{ "version": "3.0.4", "changelog": "More bug fixes\nImplement permissions", "type": "beta"