Skip to content

Commit 9b856ae

Browse files
authored
Update Hostile entities (#2542)
1 parent 5b363db commit 9b856ae

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

src/main/java/org/spongepowered/api/entity/living/Hostile.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*/
2525
package org.spongepowered.api.entity.living;
2626

27-
public interface Hostile extends Agent {
27+
import org.spongepowered.api.entity.Entity;
28+
29+
public interface Hostile extends Entity {
2830

2931
}

src/main/java/org/spongepowered/api/entity/living/animal/Hoglin.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
*/
2525
package org.spongepowered.api.entity.living.animal;
2626

27+
import org.spongepowered.api.entity.living.Hostile;
28+
2729
/**
2830
* Represents a Hoglin.
2931
*/
30-
public interface Hoglin extends Animal {
32+
public interface Hoglin extends Animal, Hostile {
3133
}

src/main/java/org/spongepowered/api/entity/living/golem/Shulker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
import org.spongepowered.api.data.Keys;
2828
import org.spongepowered.api.data.type.DyeColor;
2929
import org.spongepowered.api.data.value.Value;
30-
import org.spongepowered.api.entity.living.Monster;
30+
import org.spongepowered.api.entity.living.Hostile;
3131
import org.spongepowered.api.entity.living.Ranger;
3232
import org.spongepowered.api.util.Direction;
3333

34-
public interface Shulker extends Golem, Monster, Ranger {
34+
public interface Shulker extends Golem, Hostile, Ranger {
3535

3636
/**
3737
* {@link Keys#DYE_COLOR}

src/main/java/org/spongepowered/api/entity/living/monster/Phantom.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929
import org.spongepowered.api.data.value.Value;
3030
import org.spongepowered.api.entity.Aerial;
3131
import org.spongepowered.api.entity.living.Agent;
32+
import org.spongepowered.api.entity.living.Hostile;
3233

33-
public interface Phantom extends Agent, Aerial {
34+
public interface Phantom extends Agent, Hostile, Aerial {
3435

3536
/**
3637
* {@link Keys#PHANTOM_PHASE}

src/main/java/org/spongepowered/api/entity/living/monster/boss/Boss.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
import net.kyori.adventure.bossbar.BossBar;
2828
import org.spongepowered.api.data.Keys;
2929
import org.spongepowered.api.data.value.Value;
30-
import org.spongepowered.api.entity.living.Hostile;
30+
import org.spongepowered.api.entity.Entity;
3131

3232
/**
3333
* Represents a boss monster that may cause a boss health bar to show
3434
* on client interfaces.
3535
*/
36-
public interface Boss extends Hostile {
36+
public interface Boss extends Entity {
3737

3838
/**
3939
* {@link Keys#BOSS_BAR}

src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/EnderDragon.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
import org.spongepowered.api.data.value.Value;
2929
import org.spongepowered.api.entity.Aerial;
3030
import org.spongepowered.api.entity.explosive.EndCrystal;
31+
import org.spongepowered.api.entity.living.Agent;
3132
import org.spongepowered.api.entity.living.ComplexLiving;
32-
import org.spongepowered.api.entity.living.Monster;
33+
import org.spongepowered.api.entity.living.Hostile;
3334
import org.spongepowered.api.entity.living.Ranger;
3435
import org.spongepowered.api.entity.living.monster.boss.Boss;
3536
import org.spongepowered.api.entity.living.monster.boss.dragon.phase.DragonPhase;
@@ -40,7 +41,7 @@
4041
/**
4142
* Represents an Ender Dragon.
4243
*/
43-
public interface EnderDragon extends ComplexLiving<EnderDragonPart>, Boss, Monster, Aerial, Ranger {
44+
public interface EnderDragon extends ComplexLiving<EnderDragonPart>, Boss, Agent, Hostile, Aerial, Ranger {
4445

4546
/**
4647
* {@link Keys#HEALING_CRYSTAL}

0 commit comments

Comments
 (0)