mirror of
https://github.com/songoda/EpicBosses.git
synced 2024-09-30 06:18:03 +02:00
Merge branch 'development'
This commit is contained in:
commit
dc8f9a78dd
@ -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.8</version>
|
<version>1.2.9</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -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.8</version>
|
<version>1.2.9</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -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.8</version>
|
<version>1.2.9</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -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.8</version>
|
<version>1.2.9</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -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.8</version>
|
<version>1.2.9</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
@ -76,7 +76,7 @@ public abstract class TargetHandler<Holder extends IActiveHolder> implements ITa
|
|||||||
getHolder().getLivingEntityMap().values().forEach(uuid -> {
|
getHolder().getLivingEntityMap().values().forEach(uuid -> {
|
||||||
LivingEntity livingEntity = (LivingEntity) ServerUtils.get().getEntity(uuid);
|
LivingEntity livingEntity = (LivingEntity) ServerUtils.get().getEntity(uuid);
|
||||||
if (livingEntity != null && !livingEntity.isDead()) {
|
if (livingEntity != null && !livingEntity.isDead()) {
|
||||||
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_12) && livingEntity instanceof Mob)
|
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13) && livingEntity instanceof Mob)
|
||||||
((Mob) livingEntity).setTarget(newTarget);
|
((Mob) livingEntity).setTarget(newTarget);
|
||||||
else if (livingEntity instanceof Creature)
|
else if (livingEntity instanceof Creature)
|
||||||
((Creature) livingEntity).setTarget(newTarget);
|
((Creature) livingEntity).setTarget(newTarget);
|
||||||
|
@ -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.8</version>
|
<version>1.2.9</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
4
pom.xml
4
pom.xml
@ -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.8</version>
|
<version>1.2.9</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.8</plugin.version>
|
<plugin.version>1.2.9</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>
|
||||||
|
Loading…
Reference in New Issue
Block a user