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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Auxilor
2021-09-16 18:13:24 +01:00
parent fb9fdacb9f 45bbc668dc
commit 406601a193
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
View File

@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableMap;
import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.PluginDependent; import com.willfp.eco.core.PluginDependent;
import com.willfp.eco.core.config.interfaces.Config; import com.willfp.eco.core.config.interfaces.Config;
import com.willfp.eco.core.integrations.placeholder.PlaceholderEntry;
import com.willfp.eco.core.items.Items; import com.willfp.eco.core.items.Items;
import com.willfp.eco.core.items.builder.ItemBuilder; import com.willfp.eco.core.items.builder.ItemBuilder;
import com.willfp.eco.core.items.builder.ItemStackBuilder; import com.willfp.eco.core.items.builder.ItemStackBuilder;
@@ -26,6 +27,7 @@ import com.willfp.ecobosses.bosses.util.requirement.SpawnRequirement;
import com.willfp.ecobosses.bosses.util.requirement.SpawnRequirements; import com.willfp.ecobosses.bosses.util.requirement.SpawnRequirements;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.Setter;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@@ -45,6 +47,8 @@ import org.bukkit.persistence.PersistentDataType;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Base64; import java.util.Base64;
@@ -263,6 +267,10 @@ public class EcoBoss extends PluginDependent<EcoPlugin> {
@Getter @Getter
private final int autoSpawnInterval; private final int autoSpawnInterval;
@Getter
@Setter
private int timeUntilSpawn;
/** /**
* The time to live. * The time to live.
*/ */
@@ -483,6 +491,7 @@ public class EcoBoss extends PluginDependent<EcoPlugin> {
// Auto Spawn // Auto Spawn
this.autoSpawnInterval = this.getConfig().getInt("auto-spawn-interval"); this.autoSpawnInterval = this.getConfig().getInt("auto-spawn-interval");
this.timeUntilSpawn = this.autoSpawnInterval;
this.autoSpawnLocations = new ArrayList<>(); this.autoSpawnLocations = new ArrayList<>();
for (String string : this.getConfig().getStrings("auto-spawn-locations")) { for (String string : this.getConfig().getStrings("auto-spawn-locations")) {
String[] split = string.split(":"); String[] split = string.split(":");
@@ -493,6 +502,11 @@ public class EcoBoss extends PluginDependent<EcoPlugin> {
autoSpawnLocations.add(new Location(world, x, y, z)); autoSpawnLocations.add(new Location(world, x, y, z));
} }
new PlaceholderEntry(
"timeuntilspawn_"+this.name,
(player) -> new BigDecimal(this.timeUntilSpawn/20).setScale(1, RoundingMode.HALF_UP).toString(),
false
).register();
for (String req : config.getStrings("spawn-requirements", false)) { for (String req : config.getStrings("spawn-requirements", false)) {
List<String> split = Arrays.asList(req.split(":")); List<String> split = Arrays.asList(req.split(":"));

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

@@ -45,9 +45,12 @@ public class AutoSpawnTimer implements Runnable {
continue; continue;
} }
boss.setTimeUntilSpawn(boss.getTimeUntilSpawn()-1);
if (tick % boss.getAutoSpawnInterval() == 0) { if (tick % boss.getAutoSpawnInterval() == 0) {
Location location = locations.get(NumberUtils.randInt(0, locations.size() - 1)); Location location = locations.get(NumberUtils.randInt(0, locations.size() - 1));
boss.spawn(location); boss.spawn(location);
boss.setTimeUntilSpawn(boss.getAutoSpawnInterval());
} }
} }
} }