Repo-Mirror/EcoMobs
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoMobs.git synced 2025-12-20 15:39:31 +00:00
Code Issues Releases 1 Activity

Fixed several bugs

Browse Source
This commit is contained in:
Auxilor
2021-05-20 09:02:06 +01:00
parent 64f35b6338
commit efc56e1763
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
View File

@@ -94,6 +94,7 @@ public class LivingEcoBoss extends PluginDependent {
private void onSpawn() {
entity.getPersistentDataContainer().set(this.getPlugin().getNamespacedKeyFactory().create("boss"), PersistentDataType.STRING, boss.getName());
entity.setPersistent(true);
entity.setRemoveWhenFarAway(false);
entity.setCustomName(boss.getDisplayName());
entity.setCustomNameVisible(true);

4
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/listeners/AutoSpawnTimer.java
View File

@@ -31,10 +31,6 @@ public class AutoSpawnTimer implements Runnable {
continue;
}
if (!boss.getLivingBosses().isEmpty()) {
continue;
}
Set<World> worlds = new HashSet<>();
for (UUID uuid : boss.getLivingBosses().keySet()) {

28
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/util/BossUtils.java
View File

@@ -6,8 +6,10 @@ import com.willfp.ecobosses.bosses.EcoBosses;
import com.willfp.ecobosses.bosses.util.obj.DamagerProperty;
import lombok.experimental.UtilityClass;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.boss.BossBar;
import org.bukkit.boss.KeyedBossBar;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.persistence.PersistentDataType;
import org.jetbrains.annotations.NotNull;
@@ -79,6 +81,16 @@ public class BossUtils {
* @return The amount of bosses killed.
*/
public int killAllBosses() {
return killAllBosses(false);
}
/**
* Kill all bosses.
*
* @param force If all entities should be checked for being bosses.
* @return The amount of bosses killed.
*/
public int killAllBosses(final boolean force) {
int amount = 0;
for (EcoBoss boss : EcoBosses.values()) {
for (UUID uuid : boss.getLivingBosses().keySet()) {
@@ -89,6 +101,22 @@ public class BossUtils {
}
}
if (force) {
for (World world : Bukkit.getWorlds()) {
for (Entity entity : world.getEntities()) {
if (!(entity instanceof LivingEntity)) {
continue;
}
if (BossUtils.getBoss((LivingEntity) entity) == null) {
continue;
}
entity.remove();
}
}
}
List<KeyedBossBar> bars = new ArrayList<>();
Bukkit.getBossBars().forEachRemaining(bars::add);
for (KeyedBossBar bar : bars) {

7
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/commands/CommandEbkillall.java
View File

@@ -21,6 +21,11 @@ public class CommandEbkillall extends AbstractCommand {
@Override
public void onExecute(@NotNull final CommandSender sender,
@NotNull final List<String> args) {
sender.sendMessage(this.getPlugin().getLangYml().getMessage("killall").replace("%amount%", String.valueOf(BossUtils.killAllBosses())));
boolean force = false;
if (args.size() == 1) {
force = args.get(0).equalsIgnoreCase("force");
}
sender.sendMessage(this.getPlugin().getLangYml().getMessage("killall").replace("%amount%", String.valueOf(BossUtils.killAllBosses(force))));
}
}