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

Merge branch 'development'

This commit is contained in:
songoda 2020-01-16 21:43:49 -05:00
parent 5f21d27d0d 2549af213d
commit b62644ab54
8 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-modules/FactionsM/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>EpicBosses</artifactId> <artifactId>EpicBosses</artifactId>
<groupId>com.songoda.epicbosses</groupId> <groupId>com.songoda.epicbosses</groupId>
<version>1.2.5</version> <version>1.2.6</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
api-modules/FactionsOne/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>EpicBosses</artifactId> <artifactId>EpicBosses</artifactId>
<groupId>com.songoda.epicbosses</groupId> <groupId>com.songoda.epicbosses</groupId>
<version>1.2.5</version> <version>1.2.6</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
api-modules/FactionsUUID/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>EpicBosses</artifactId> <artifactId>EpicBosses</artifactId>
<groupId>com.songoda.epicbosses</groupId> <groupId>com.songoda.epicbosses</groupId>
<version>1.2.5</version> <version>1.2.6</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
api-modules/LegacyFactions/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>EpicBosses</artifactId> <artifactId>EpicBosses</artifactId>
<groupId>com.songoda.epicbosses</groupId> <groupId>com.songoda.epicbosses</groupId>
<version>1.2.5</version> <version>1.2.6</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
plugin-modules/Core/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>EpicBosses</artifactId> <artifactId>EpicBosses</artifactId>
<groupId>com.songoda.epicbosses</groupId> <groupId>com.songoda.epicbosses</groupId>
<version>1.2.5</version> <version>1.2.6</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

5
plugin-modules/Core/src/com/songoda/epicbosses/mechanics/boss/HealthMechanic.java
View File

@ -20,9 +20,8 @@ public class HealthMechanic implements IBossMechanic {
public boolean applyMechanic(BossEntity bossEntity, ActiveBossHolder activeBossHolder) { public boolean applyMechanic(BossEntity bossEntity, ActiveBossHolder activeBossHolder) {
if (activeBossHolder.getLivingEntityMap().getOrDefault(1, null) == null) return false; if (activeBossHolder.getLivingEntityMap().getOrDefault(1, null) == null) return false;
Object o = SpigotYmlReader.get().getObject("settings.attribute.maxHealth.max"); double maxHealthSetting = Double.valueOf( SpigotYmlReader
.get().getObject("settings.attribute.maxHealth.max").toString());
double maxHealthSetting = o instanceof Double ? (double) o : (double) (int) o;
for (EntityStatsElement entityStatsElement : bossEntity.getEntityStats()) { for (EntityStatsElement entityStatsElement : bossEntity.getEntityStats()) {
MainStatsElement mainStatsElement = entityStatsElement.getMainStats(); MainStatsElement mainStatsElement = entityStatsElement.getMainStats();

2
plugin-modules/FactionHelper/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>EpicBosses</artifactId> <artifactId>EpicBosses</artifactId>
<groupId>com.songoda.epicbosses</groupId> <groupId>com.songoda.epicbosses</groupId>
<version>1.2.5</version> <version>1.2.6</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.songoda.epicbosses</groupId> <groupId>com.songoda.epicbosses</groupId>
<artifactId>EpicBosses</artifactId> <artifactId>EpicBosses</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.2.5</version> <version>1.2.6</version>
<modules> <modules>
<module>api-modules/FactionsM</module> <module>api-modules/FactionsM</module>
@ -16,7 +16,7 @@
</modules> </modules>
<properties> <properties>
<plugin.version>1.2.5</plugin.version> <plugin.version>1.2.6</plugin.version>
<plugin.name>EpicBosses</plugin.name> <plugin.name>EpicBosses</plugin.name>
<plugin.main>com.songoda.epicbosses.EpicBosses</plugin.main> <plugin.main>com.songoda.epicbosses.EpicBosses</plugin.main>
<plugin.author>Songoda</plugin.author> <plugin.author>Songoda</plugin.author>