Upstream
/
EpicBosses
mirror of https://github.com/songoda/EpicBosses.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert 1.1.8, moved changes to Legacy-1.1.8

This commit is contained in:
Esophose 2019-03-16 09:28:13 -06:00
parent 9eb74f9fcd
commit 02313e8a8f
8 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables:
name: "EpicBosses"
path: "/builds/$CI_PROJECT_PATH"
version: "1.1.8-U4"
version: "1.0.0"
build:
stage: build

5
TODO
View File

@ -5,4 +5,7 @@
-> AutoSpawns Editing GUI
01:00 -> Wilderness - Button to change max coords, boss that autospawn applies to, maxActiveBosses, spawnChance
01:00 -> Spawner - Button to change max coords, boss that autospawn applies to, maxActiveBosses, spawnChance
01:00 -> Biome - Button to change max bosses per biome, boss that autospawn applies to, spawnChance
01:00 -> Biome - Button to change max bosses per biome, boss that autospawn applies to, spawnChance
-----------
8:45 hrs

5
plugin-modules/Core/src/com/songoda/epicbosses/autospawns/types/IntervalSpawnElement.java
View File

@ -7,7 +7,6 @@ import com.songoda.epicbosses.autospawns.IAutoSpawnCustomSettingsHandler;
import com.songoda.epicbosses.autospawns.handlers.IntervalSpawnHandler;
import com.songoda.epicbosses.autospawns.settings.AutoSpawnSettings;
import com.songoda.epicbosses.entity.BossEntity;
import com.songoda.epicbosses.events.BossSpawnEvent;
import com.songoda.epicbosses.holder.ActiveBossHolder;
import com.songoda.epicbosses.holder.autospawn.ActiveIntervalAutoSpawnHolder;
import com.songoda.epicbosses.listeners.IBossDeathHandler;
@ -91,10 +90,6 @@ public class IntervalSpawnElement implements IAutoSpawnCustomSettingsHandler {
activeBossHolder.getPostBossDeathHandlers().add(bossDeathHandler);
activeAutoSpawnHolder.getActiveBossHolders().add(activeBossHolder);
BossSpawnEvent bossSpawnEvent = new BossSpawnEvent(activeBossHolder, true);
ServerUtils.get().callEvent(bossSpawnEvent);
}
if(customSpawnMessage && spawnMessage != null) {

6
plugin-modules/Core/src/com/songoda/epicbosses/events/BossDeathEvent.java
View File

@ -14,12 +14,10 @@ public class BossDeathEvent extends Event {
private static final HandlerList handlers = new HandlerList();
@Getter private final ActiveBossHolder activeBossHolder;
@Getter private final boolean autoSpawn;
@Getter private ActiveBossHolder activeBossHolder;
public BossDeathEvent(ActiveBossHolder activeBossHolder, boolean autoSpawn) {
public BossDeathEvent(ActiveBossHolder activeBossHolder) {
this.activeBossHolder = activeBossHolder;
this.autoSpawn = autoSpawn;
}
@Override

6
plugin-modules/Core/src/com/songoda/epicbosses/events/BossSpawnEvent.java
View File

@ -14,12 +14,10 @@ public class BossSpawnEvent extends Event {
private static final HandlerList handlers = new HandlerList();
@Getter private final ActiveBossHolder activeBossHolder;
@Getter private final boolean autoSpawn;
@Getter private ActiveBossHolder activeBossHolder;
public BossSpawnEvent(ActiveBossHolder activeBossHolder, boolean autoSpawn) {
public BossSpawnEvent(ActiveBossHolder activeBossHolder) {
this.activeBossHolder = activeBossHolder;
this.autoSpawn = autoSpawn;
}
@Override

5
plugin-modules/Core/src/com/songoda/epicbosses/listeners/after/BossDeathListener.java
View File

@ -7,6 +7,7 @@ import com.songoda.epicbosses.events.BossDeathEvent;
import com.songoda.epicbosses.events.PreBossDeathEvent;
import com.songoda.epicbosses.holder.ActiveBossHolder;
import com.songoda.epicbosses.holder.DeadBossHolder;
import com.songoda.epicbosses.listeners.IBossDeathHandler;
import com.songoda.epicbosses.managers.BossEntityManager;
import com.songoda.epicbosses.utils.Debug;
import com.songoda.epicbosses.utils.MessageUtils;
@ -139,12 +140,10 @@ public class BossDeathListener implements Listener {
}
});
boolean autoSpawn = !activeBossHolder.getPostBossDeathHandlers().isEmpty();
activeBossHolder.getPostBossDeathHandlers().forEach(handler -> handler.onPreDeath(event));
DeadBossHolder deadBossHolder = new DeadBossHolder(bossEntity, location, mapOfDamage, mapOfPercent);
BossDeathEvent bossDeathEvent = new BossDeathEvent(activeBossHolder, autoSpawn);
BossDeathEvent bossDeathEvent = new BossDeathEvent(activeBossHolder);
DropTable dropTable = this.bossEntityManager.getDropTable(bossEntity);
if(dropTable == null) {

2
plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java
View File

@ -141,7 +141,7 @@ public class BossSpawnListener implements Listener {
activeBossHolder.getTargetHandler().runTargetCycle();
this.bossTauntManager.handleTauntSystem(activeBossHolder);
BossSpawnEvent bossSpawnEvent = new BossSpawnEvent(activeBossHolder, false);
BossSpawnEvent bossSpawnEvent = new BossSpawnEvent(activeBossHolder);
ServerUtils.get().callEvent(bossSpawnEvent);
}

2
pom.xml
View File

@ -19,7 +19,7 @@
</modules>
<properties>
<plugin.version>1.1.8-U4</plugin.version>
<plugin.version>1.0.8-U1</plugin.version>
<plugin.name>EpicBosses</plugin.name>
<plugin.main>com.songoda.epicbosses.CustomBosses</plugin.main>
<plugin.author>AMinecraftDev</plugin.author>