adjust to review and add todo

ldtteam · Nov 12, 2024 · 3d94fb0 · 3d94fb0
1 parent 3d798a7
commit 3d94fb0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/src/main/java/com/minecolonies/api/entity/mobs/AbstractEntityRaiderMob.java b/src/main/java/com/minecolonies/api/entity/mobs/AbstractEntityRaiderMob.java
@@ -767,9 +767,9 @@ public ITickRateStateMachine<IState> getAI()
     }
 
     @Override
-    public String getTeamName()
+    public int getTeamId()
     {
         // All raiders are in the same team. You're doomed!
-        return "raider";
+        return -1;
     }
 }
diff --git a/src/main/java/com/minecolonies/api/entity/other/AbstractFastMinecoloniesEntity.java b/src/main/java/com/minecolonies/api/entity/other/AbstractFastMinecoloniesEntity.java
@@ -356,7 +356,7 @@ public void knockback(double power, double xRatio, double zRatio)
     @Override
     public boolean hurt(final DamageSource dmgSource, final float dmg)
     {
-        if (dmgSource.getEntity() instanceof AbstractFastMinecoloniesEntity otherFastMinecolEntity && otherFastMinecolEntity.getTeamName().equals(getTeamName()))
+        if (dmgSource.getEntity() instanceof AbstractFastMinecoloniesEntity otherFastMinecolEntity && otherFastMinecolEntity.getTeamId() == getTeamId())
         {
             return false;
         }
@@ -365,7 +365,8 @@ public boolean hurt(final DamageSource dmgSource, final float dmg)
 
     /**
      * Get the team name of this entity.
+     * todo sam make colony ids unique across dimensions.
      * @return the team name.
      */
-    public abstract String getTeamName();
+    public abstract int getTeamId();
 }
diff --git a/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java b/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java
@@ -1984,8 +1984,8 @@ public void setMaxAir(final int maxAir)
     }
 
     @Override
-    public String getTeamName()
+    public int getTeamId()
     {
-        return level().dimension().hashCode() + "_" + citizenColonyHandler.getColonyId();
+        return citizenColonyHandler.getColonyId();
     }
 }
diff --git a/src/main/java/com/minecolonies/core/entity/mobs/EntityMercenary.java b/src/main/java/com/minecolonies/core/entity/mobs/EntityMercenary.java
@@ -569,8 +569,8 @@ private static boolean isValidSpawnForMercenaries(final LevelAccessor world, fin
     }
 
     @Override
-    public String getTeamName()
+    public int getTeamId()
     {
-        return level().dimension().hashCode() + "_" + colonyId;
+        return colonyId;
     }
 }
diff --git a/src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java b/src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java
@@ -691,8 +691,8 @@ public void setRemoved(final RemovalReason reason)
     }
 
     @Override
-    public String getTeamName()
+    public int getTeamId()
     {
-        return level().dimension().hashCode() + "_" + citizenColonyHandler.getColonyId();
+        return citizenColonyHandler.getColonyId();
     }
 }