diff --git a/src/main/java/com/minecolonies/core/colony/managers/CitizenManager.java b/src/main/java/com/minecolonies/core/colony/managers/CitizenManager.java index 1bea9f5c10a..8b31e5261a7 100755 --- a/src/main/java/com/minecolonies/core/colony/managers/CitizenManager.java +++ b/src/main/java/com/minecolonies/core/colony/managers/CitizenManager.java @@ -312,10 +312,11 @@ private ICitizenData spawnCitizenOnPosition( entity.setUUID(citizenData.getUUID()); entity.setPos(spawnPoint.getX() + HALF_BLOCK, spawnPoint.getY() + SLIGHTLY_UP, spawnPoint.getZ() + HALF_BLOCK); - world.addFreshEntity(entity); entity.setCitizenId(citizenData.getId()); entity.getCitizenColonyHandler().setColonyId(colony.getID()); + + world.addFreshEntity(entity); if (entity.isAddedToWorld()) { entity.getCitizenColonyHandler().registerWithColony(citizenData.getColony().getID(), citizenData.getId());