mirror of
https://github.com/songoda/EpicEnchants.git
synced 2024-12-23 01:27:43 +01:00
Merge branch 'SD-7555' into development
This commit is contained in:
commit
bba7394942
4
pom.xml
4
pom.xml
@ -78,7 +78,7 @@
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>public</id>
|
||||
<url>http://repo.songoda.com/repository/public/</url>
|
||||
<url>https://repo.songoda.com/repository/public/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>jitpack.io</id>
|
||||
@ -91,6 +91,7 @@
|
||||
<groupId>org.spigotmc</groupId>
|
||||
<artifactId>spigot</artifactId>
|
||||
<version>1.16.4</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>fr.mrmicky</groupId>
|
||||
@ -108,6 +109,7 @@
|
||||
<groupId>com.songoda</groupId>
|
||||
<artifactId>UltimateBottles</artifactId>
|
||||
<version>1_0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>me.clip</groupId>
|
||||
|
@ -7,7 +7,7 @@ import com.songoda.core.compatibility.CompatibleMaterial;
|
||||
import com.songoda.core.configuration.Config;
|
||||
import com.songoda.core.gui.GuiManager;
|
||||
import com.songoda.core.hooks.EconomyManager;
|
||||
import com.songoda.epicenchants.command.commands.*;
|
||||
import com.songoda.epicenchants.commands.*;
|
||||
import com.songoda.epicenchants.listeners.ArmorListener;
|
||||
import com.songoda.epicenchants.listeners.EntityListener;
|
||||
import com.songoda.epicenchants.listeners.HeldItemListener;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.epicenchants.EpicEnchants;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.core.compatibility.CompatibleMaterial;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.epicenchants.EpicEnchants;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.epicenchants.CommandCommons;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.epicenchants.CommandCommons;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.epicenchants.EpicEnchants;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.epicenchants.CommandCommons;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.epicenchants.EpicEnchants;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.epicenchants.EpicEnchants;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.core.configuration.editor.PluginConfigGui;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.songoda.epicenchants.command.commands;
|
||||
package com.songoda.epicenchants.commands;
|
||||
|
||||
import com.songoda.core.commands.AbstractCommand;
|
||||
import com.songoda.epicenchants.EpicEnchants;
|
||||
|
@ -2,6 +2,7 @@ package com.songoda.epicenchants.effect.effects;
|
||||
|
||||
import com.songoda.epicenchants.effect.EffectExecutor;
|
||||
import com.songoda.epicenchants.enums.EventType;
|
||||
import com.songoda.epicenchants.objects.LeveledModifier;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -15,6 +16,8 @@ public class Explode extends EffectExecutor {
|
||||
|
||||
@Override
|
||||
public void execute(@NotNull Player user, @Nullable LivingEntity opponent, int level, EventType eventType) {
|
||||
consume(entity -> entity.getWorld().createExplosion(entity.getLocation(), getSection().getInt("magnitude")), user, opponent);
|
||||
consume(entity -> entity.getWorld().createExplosion(entity.getLocation(), (float) LeveledModifier
|
||||
.of(getSection().getString("magnitude")).get(level, level, user, opponent)),
|
||||
user, opponent);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user