From c2dfc2d73c290afdc75c0cce96d68b8e1c9063e1 Mon Sep 17 00:00:00 2001 From: JasperLorelai Date: Mon, 11 Mar 2024 19:02:53 +0100 Subject: [PATCH 1/2] docs: Fix images and use pretty badges [no ci] --- README.md | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 73c6a2bbf..3e6882931 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,13 @@

- MagicSpells Icon + MagicSpells Icon

Magic without writing Java

- Build Status - Discord Server - - Github Downloads - Github Downloads Latest - - Licence - In MC servers + Build Status + Discord Server + Github Downloads + Licence + In MC servers
[//]: # (These links are here for easier hyperlink referencing and less clutter in the actual text below.) @@ -27,7 +24,7 @@ [PaperMC]: https://papermc.io/ [Modrinth]: https://modrinth.com/plugin/magicspells [DiscordBadge]: https://img.shields.io/badge/Join%20our%20Discord-blue?style=for-the-badge&color=586ff2 -[WelcomeChannel]: https://media.discordapp.net/attachments/423551934784339968/957725621503541288/unknown.png +[WelcomeChannel]: https://files.jasperlorelai.eu/magicspells/images/readme_discord_screenshot.png MagicSpells is a [PaperMC] plugin which gives its users the ability to modify their Minecraft servers by configuring existing features without writing Java code. It provides you with the tools for playing with blocks of logic, bringing other plugins together, playing fantastic special effects, making your own new mechanics, and more. @@ -48,7 +45,7 @@ Check out more examples of what this plugin can do in our [Discord server] (in t --- ## Classical MagicSpells ⭐ -This plugin was originally created by [Nisovin], and published on [Bukkit]. After some time TheComputerGeek2 took over the project and published it on [Spigot]. Since then we dropped support for Spigot and moved to [PaperMC], and the plugin was published on [Modrinth]. +This plugin was originally created by [Nisovin], and published on [Bukkit]. After some time TheComputerGeek2 took over the project and published it on [Spigot]. Since then, we dropped support for Spigot and moved to [PaperMC], and the plugin was published on [Modrinth]. From f37e71953ba722ae0e895232e4e1e3cefa94a43e Mon Sep 17 00:00:00 2001 From: JasperLorelai Date: Mon, 11 Mar 2024 23:18:16 +0100 Subject: [PATCH 2/2] fix: Play correct delayed effects --- .../com/nisovin/magicspells/spelleffects/SpellEffect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/nisovin/magicspells/spelleffects/SpellEffect.java b/core/src/main/java/com/nisovin/magicspells/spelleffects/SpellEffect.java index 612449903..c0c572dac 100644 --- a/core/src/main/java/com/nisovin/magicspells/spelleffects/SpellEffect.java +++ b/core/src/main/java/com/nisovin/magicspells/spelleffects/SpellEffect.java @@ -332,7 +332,7 @@ public final Entity playEntityEffect(final Location location, SpellData data) { if (delay <= 0) return playEntityEffectLocationReal(location, data); SpellData finalData = data; - MagicSpells.scheduleDelayedTask(() -> playEffectLibLocationReal(location, finalData), delay); + MagicSpells.scheduleDelayedTask(() -> playEntityEffectLocationReal(location, finalData), delay); return null; } @@ -354,7 +354,7 @@ public final ArmorStand playArmorStandEffect(final Location location, SpellData if (delay <= 0) return playArmorStandEffectLocationReal(location, data); SpellData finalData = data; - MagicSpells.scheduleDelayedTask(() -> playEffectLibLocationReal(location, finalData), delay); + MagicSpells.scheduleDelayedTask(() -> playArmorStandEffectLocationReal(location, finalData), delay); return null; }