Move TeamMember from Living to Entity

SpongePowered · Oct 12, 2023 · 46c9301 · 46c9301
1 parent 2729a88
commit 46c9301
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/org/spongepowered/api/entity/Entity.java b/src/main/java/org/spongepowered/api/entity/Entity.java
@@ -36,6 +36,7 @@
 import org.spongepowered.api.effect.VanishState;
 import org.spongepowered.api.event.cause.entity.damage.source.DamageSource;
 import org.spongepowered.api.projectile.source.EntityProjectileSource;
+import org.spongepowered.api.scoreboard.TeamMember;
 import org.spongepowered.api.util.AABB;
 import org.spongepowered.api.util.Identifiable;
 import org.spongepowered.api.util.RandomProvider;
@@ -78,7 +79,7 @@
  */
 @DoNotStore
 public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEntity>, Locatable, EntityProjectileSource, Sound.Emitter,
-        SerializableDataHolder.Mutable, RandomProvider {
+        SerializableDataHolder.Mutable, RandomProvider, TeamMember {
 
     /**
      * Gets the {@link EntityType}.

diff --git a/src/main/java/org/spongepowered/api/entity/living/Living.java b/src/main/java/org/spongepowered/api/entity/living/Living.java
@@ -34,7 +34,6 @@
 import org.spongepowered.api.entity.attribute.Attribute;
 import org.spongepowered.api.entity.attribute.AttributeHolder;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
-import org.spongepowered.api.scoreboard.TeamMember;
 import org.spongepowered.math.imaginary.Quaterniond;
 import org.spongepowered.math.vector.Vector3d;
 
@@ -44,10 +43,9 @@
  * Represents an entity that is living, and therefor can be damaged.
  *
  * <p>Living entities can have {@link PotionEffect}s, breathing air
- * under water, custom names, be meaningfully added to teams, hold {@link Attribute}s, and become
- * invisible.</p>
+ * under water, custom names, hold {@link Attribute}s, and become invisible.</p>
  */
-public interface Living extends AttributeHolder, Entity, TeamMember {
+public interface Living extends AttributeHolder, Entity {
 
     /**
      * {@link Keys#ABSORPTION}